4 files changed, 22 insertions, 16 deletions

diff --git a/init/Kconfig b/init/Kconfig
index f000edb3bb7a..a3f83e2c8250 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -450,7 +450,7 @@ config SHMEM
 
 config SLAB
         default y
-        bool "Use full SLAB allocator" if EMBEDDED
+        bool "Use full SLAB allocator" if (EMBEDDED && !SMP && !SPARSEMEM)
         help
           Disabling this replaces the advanced SLAB allocator and
           kmalloc support with the drastically simpler SLOB allocator.
@@ -461,10 +461,10 @@ config VM_EVENT_COUNTERS
         default y
         bool "Enable VM event counters for /proc/vmstat" if EMBEDDED
         help
-          VM event counters are only needed to for event counts to be
-          shown. They have no function for the kernel itself. This
-          option allows the disabling of the VM event counters.
-          /proc/vmstat will only show page counts.
+          VM event counters are needed for event counts to be shown.
+          This option allows the disabling of the VM event counters
+          on EMBEDDED systems.  /proc/vmstat will only show page counts
+          if VM event counters are disabled.
 
 endmenu         # General setup
 
diff --git a/init/Makefile b/init/Makefile
index d6c764d0eabb..633a268d270d 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -15,7 +15,6 @@ clean-files := ../include/linux/compile.h
 
 # dependencies on generated files need to be listed explicitly
 
-$(obj)/main.o: include/linux/compile.h
 $(obj)/version.o: include/linux/compile.h
 
 # compile.h changes depending on hostname, generation number, etc,
diff --git a/init/main.c b/init/main.c
index e3f0bb20b4dd..8b4a7d769162 100644
--- a/init/main.c
+++ b/init/main.c
@@ -50,9 +50,8 @@
 #include <linux/buffer_head.h>
 #include <linux/debug_locks.h>
 #include <linux/lockdep.h>
-#include <linux/utsrelease.h>
 #include <linux/pid_namespace.h>
-#include <linux/compile.h>
+#include <linux/device.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -94,7 +93,6 @@ extern void pidmap_init(void);
 extern void prio_tree_init(void);
 extern void radix_tree_init(void);
 extern void free_initmem(void);
-extern void driver_init(void);
 extern void prepare_namespace(void);
 #ifdef  CONFIG_ACPI
 extern void acpi_early_init(void);
@@ -482,12 +480,6 @@ void __init __attribute__((weak)) smp_setup_processor_id(void)
 {
 }
 
-static const char linux_banner[] =
-        "Linux version " UTS_RELEASE
-        " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
-        " (" LINUX_COMPILER ")"
-        " " UTS_VERSION "\n";
-
 asmlinkage void __init start_kernel(void)
 {
         char * command_line;
@@ -538,6 +530,11 @@ asmlinkage void __init start_kernel(void)
         parse_args("Booting kernel", command_line, __start___param,
                    __stop___param - __start___param,
                    &unknown_bootoption);
+        if (!irqs_disabled()) {
+                printk(KERN_WARNING "start_kernel(): bug: interrupts were "
+                                "enabled *very* early, fixing it\n");
+                local_irq_disable();
+        }
         sort_main_extable();
         trap_init();
         rcu_init();
@@ -698,7 +695,7 @@ static void __init do_basic_setup(void)
         do_initcalls();
 }
 
-static void do_pre_smp_initcalls(void)
+static void __init do_pre_smp_initcalls(void)
 {
         extern int spawn_ksoftirqd(void);
 #ifdef CONFIG_SMP
diff --git a/init/version.c b/init/version.c
index 9d96d36501ca..6c01ec1cc48d 100644
--- a/init/version.c
+++ b/init/version.c
@@ -33,3 +33,13 @@ struct uts_namespace init_uts_ns = {
         },
 };
 EXPORT_SYMBOL_GPL(init_uts_ns);
+
+/* FIXED STRINGS! Don't touch! */
+const char linux_banner[] =
+        "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
+        LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
+
+const char linux_proc_banner[] =
+        "%s version %s"
+        " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
+        " (" LINUX_COMPILER ") %s\n";