2 files changed, 24 insertions, 9 deletions

diff --git a/init/Kconfig b/init/Kconfig
index e50c63fb8839..38899243213d 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -334,6 +334,15 @@ config TREE_PREEMPT_RCU
           is also required.  It also scales down nicely to
           smaller systems.
 
+config TINY_RCU
+        bool "UP-only small-memory-footprint RCU"
+        depends on !SMP
+        help
+          This option selects the RCU implementation that is
+          designed for UP systems from which real-time response
+          is not required.  This option greatly reduces the
+          memory footprint of RCU.
+
 endchoice
 
 config RCU_TRACE
@@ -606,7 +615,7 @@ config SYSFS_DEPRECATED
         bool
 
 config SYSFS_DEPRECATED_V2
-        bool "remove sysfs features which may confuse old userspace tools"
+        bool "enable deprecated sysfs features which may confuse old userspace tools"
         depends on SYSFS
         default n
         select SYSFS_DEPRECATED
@@ -1099,6 +1108,16 @@ config SLOW_WORK
 
           See Documentation/slow-work.txt.
 
+config SLOW_WORK_DEBUG
+        bool "Slow work debugging through debugfs"
+        default n
+        depends on SLOW_WORK && DEBUG_FS
+        help
+          Display the contents of the slow work run queue through debugfs,
+          including items currently executing.
+
+          See Documentation/slow-work.txt.
+
 endmenu         # General setup
 
 config HAVE_GENERIC_DMA_COHERENT
@@ -1211,3 +1230,4 @@ source "block/Kconfig"
 config PREEMPT_NOTIFIERS
         bool
 
+source "kernel/Kconfig.locks"
diff --git a/init/main.c b/init/main.c
index 5988debfc505..4051d75dd2d6 100644
--- a/init/main.c
+++ b/init/main.c
@@ -251,7 +251,7 @@ early_param("loglevel", loglevel);
 
 /*
  * Unknown boot options get handed to init, unless they look like
- * failed parameters
+ * unused parameters (modprobe will find them in /proc/cmdline).
  */
 static int __init unknown_bootoption(char *param, char *val)
 {
@@ -272,14 +272,9 @@ static int __init unknown_bootoption(char *param, char *val)
         if (obsolete_checksetup(param))
                 return 0;
 
-        /*
-         * Preemptive maintenance for "why didn't my misspelled command
-         * line work?"
-         */
-        if (strchr(param, '.') && (!val || strchr(param, '.') < val)) {
-                printk(KERN_ERR "Unknown boot option `%s': ignoring\n", param);
+        /* Unused module parameter. */
+        if (strchr(param, '.') && (!val || strchr(param, '.') < val))
                 return 0;
-        }
 
         if (panic_later)
                 return 0;