Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 9 insertions, 12 deletions

diff --git a/init/main.c b/init/main.c
index 1174ae3aec8c..8b4a7d769162 100644
--- a/init/main.c
+++ b/init/main.c
@@ -50,6 +50,8 @@
 #include <linux/buffer_head.h>
 #include <linux/debug_locks.h>
 #include <linux/lockdep.h>
+#include <linux/pid_namespace.h>
+#include <linux/device.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -91,8 +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 populate_rootfs(void);
-extern void driver_init(void);
 extern void prepare_namespace(void);
 #ifdef  CONFIG_ACPI
 extern void acpi_early_init(void);
@@ -530,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();
@@ -624,8 +629,6 @@ static int __init initcall_debug_setup(char *str)
 }
 __setup("initcall_debug", initcall_debug_setup);
 
-struct task_struct *child_reaper = &init_task;
-
 extern initcall_t __initcall_start[], __initcall_end[];
 
 static void __init do_initcalls(void)
@@ -692,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
@@ -725,7 +728,7 @@ static int init(void * unused)
          * assumptions about where in the task array this
          * can be found.
          */
-        child_reaper = current;
+        init_pid_ns.child_reaper = current;
 
         cad_pid = task_pid(current);
 
@@ -738,12 +741,6 @@ static int init(void * unused)
 
         cpuset_init_smp();
 
-        /*
-         * Do this before initcalls, because some drivers want to access
-         * firmware files.
-         */
-        populate_rootfs();
-
         do_basic_setup();
 
         /*