aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-06-30 01:55:51 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 11:25:37 -0700
commitdd673bca474a199fb8d1b6a311832592977ecb5f (patch)
tree133bc25768485f6952c39b4553c5a3e712de23af /init
parent033ab7f8e5c655f49ec8039930b2efd412abbbd7 (diff)
[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>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index f515948889a7..a5b073a103e7 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.