3 files changed, 30 insertions, 13 deletions

diff --git a/init/Kconfig b/init/Kconfig
index d0edf42f4d..322b1f8c21 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -143,9 +143,7 @@ config POSIX_MQUEUE
           queues every message has a priority which decides about succession
           of receiving it by a process. If you want to compile and run
           programs written e.g. for Solaris with use of its POSIX message
-          queues (functions mq_*) say Y here. To use this feature you will
-          also need mqueue library, available from
-          <http://www.mat.uni.torun.pl/~wrona/posix_ipc/>
+          queues (functions mq_*) say Y here.
 
           POSIX message queues are visible as a filesystem called 'mqueue'
           and can be mounted somewhere if you want to do filesystem
@@ -308,7 +306,7 @@ config SYSFS_DEPRECATED
           releases.
 
           If enabled, this option will also move any device structures
-          that belong to a class, back into the /sys/class heirachy, in
+          that belong to a class, back into the /sys/class hierarchy, in
           order to support older versions of udev.
 
           If you are using a distro that was released in 2006 or later,
@@ -504,6 +502,16 @@ config VM_EVENT_COUNTERS
           on EMBEDDED systems.  /proc/vmstat will only show page counts
           if VM event counters are disabled.
 
+config SLUB_DEBUG
+        default y
+        bool "Enable SLUB debugging support" if EMBEDDED
+        depends on SLUB
+        help
+          SLUB has extensive debug support features. Disabling these can
+          result in significant savings in code size. This also disables
+          SLUB sysfs support. /sys/slab will not exist and there will be
+          no support for cache validation etc.
+
 choice
         prompt "Choose SLAB allocator"
         default SLAB
@@ -514,9 +522,9 @@ config SLAB
         bool "SLAB"
         help
           The regular slab allocator that is established and known to work
-          well in all environments. It organizes chache hot objects in
+          well in all environments. It organizes cache hot objects in
           per cpu and per node queues. SLAB is the default choice for
-          slab allocator.
+          a slab allocator.
 
 config SLUB
         depends on EXPERIMENTAL && !ARCH_USES_SLAB_PAGE_STRUCT
@@ -526,21 +534,20 @@ config SLUB
            instead of managing queues of cached objects (SLAB approach).
            Per cpu caching is realized using slabs of objects instead
            of queues of objects. SLUB can use memory efficiently
-           way and has enhanced diagnostics.
+           and has enhanced diagnostics.
 
 config SLOB
 #
-#       SLOB cannot support SMP because SLAB_DESTROY_BY_RCU does not work
-#       properly.
+#       SLOB does not support SMP because SLAB_DESTROY_BY_RCU is unsupported
 #
         depends on EMBEDDED && !SMP && !SPARSEMEM
         bool "SLOB (Simple Allocator)"
         help
            SLOB replaces the SLAB allocator with a drastically simpler
            allocator.  SLOB is more space efficient that SLAB but does not
-           scale well (single lock for all operations) and is more susceptible
-           to fragmentation. SLOB it is a great choice to reduce
-           memory usage and code size for embedded systems.
+           scale well (single lock for all operations) and is also highly
+           susceptible to fragmentation. SLUB can accomplish a higher object
+           density. It is usually better to use SLUB instead of SLOB.
 
 endchoice
 
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 3f57ed4599..46fe407fb0 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -7,6 +7,7 @@
 #include <linux/root_dev.h>
 #include <linux/security.h>
 #include <linux/delay.h>
+#include <linux/genhd.h>
 #include <linux/mount.h>
 #include <linux/device.h>
 #include <linux/init.h>
@@ -308,17 +309,21 @@ retry:
                 /*
                  * Allow the user to distinguish between failed sys_open
                  * and bad superblock on root device.
+                 * and give them a list of the available devices
                  */
 #ifdef CONFIG_BLOCK
                 __bdevname(ROOT_DEV, b);
 #endif
                 printk("VFS: Cannot open root device \"%s\" or %s\n",
                                 root_device_name, b);
-                printk("Please append a correct \"root=\" boot option\n");
+                printk("Please append a correct \"root=\" boot option; here are the available partitions:\n");
 
+                printk_all_partitions();
                 panic("VFS: Unable to mount root fs on %s", b);
         }
 
+        printk("List of all partitions:\n");
+        printk_all_partitions();
         printk("No filesystem could mount root, tried: ");
         for (p = fs_names; *p; p += strlen(p)+1)
                 printk(" %s", p);
diff --git a/init/main.c b/init/main.c
index c1537e0ddc..e8d080cab4 100644
--- a/init/main.c
+++ b/init/main.c
@@ -54,6 +54,7 @@
 #include <linux/lockdep.h>
 #include <linux/pid_namespace.h>
 #include <linux/device.h>
+#include <linux/kthread.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -425,8 +426,12 @@ static void __init setup_command_line(char *command_line)
 static void noinline rest_init(void)
         __releases(kernel_lock)
 {
+        int pid;
+
         kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND);
         numa_default_policy();
+        pid = kernel_thread(kthreadd, NULL, CLONE_FS | CLONE_FILES);
+        kthreadd_task = find_task_by_pid(pid);
         unlock_kernel();
 
         /*