From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 30 Jun 2006 08:55:51 +0000 (-0700)
Subject: [PATCH] UML: fix the INIT_ENV_ARG_LIMIT dependencies
X-Git-Tag: v2.6.18-rc1~292
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dd673bca474a199fb8d1b6a311832592977ecb5f;p=linux-2.6-omap-h63xx.git

[PATCH] UML: fix the INIT_ENV_ARG_LIMIT dependencies

Fix the INIT_ENV_ARG_LIMIT dependencies to what seems to have been
intended.

Spotted by Jean-Luc Leger.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/init/Kconfig b/init/Kconfig
index f515948889a..a5b073a103e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -54,8 +54,8 @@ config LOCK_KERNEL
 
 config INIT_ENV_ARG_LIMIT
 	int
-	default 32 if !USERMODE
-	default 128 if USERMODE
+	default 32 if !UML
+	default 128 if UML
 	help
 	  Maximum of each of the number of arguments and environment
 	  variables passed to init from the kernel command line.