diff --git a/[refs] b/[refs]
index 32471778aaf9..58e8d3f610ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 033ab7f8e5c655f49ec8039930b2efd412abbbd7
+refs/heads/master: dd673bca474a199fb8d1b6a311832592977ecb5f
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index f515948889a7..a5b073a103e7 100644
--- a/trunk/init/Kconfig
+++ b/trunk/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.