- Update to 3.3-rc2.

[linux-flexiantxendom0-3.2.10.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index ff49a6d..2f1668f 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -48,6 +48,7 @@
 #include <linux/rmap.h>
 #include <linux/mempolicy.h>
 #include <linux/key.h>
+#include <linux/unwind.h>
 #include <linux/buffer_head.h>
 #include <linux/page_cgroup.h>
 #include <linux/debug_locks.h>
@@ -469,6 +470,7 @@ asmlinkage void __init start_kernel(void)
         * Need to run as early as possible, to initialize the
         * lockdep hash:
         */
+       unwind_init();
        lockdep_init();
        smp_setup_processor_id();
        debug_objects_early_init();
@@ -495,6 +497,7 @@ asmlinkage void __init start_kernel(void)
        mm_init_owner(&init_mm, &init_task);
        mm_init_cpumask(&init_mm);
        setup_command_line(command_line);
+       unwind_setup();
        setup_nr_cpu_ids();
        setup_per_cpu_areas();
        smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */