Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

[safe/jmp/linux-2.6] / init / main.c

diff --git a/init/main.c b/init/main.c
index 2c48c31..6107223 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -68,6 +68,7 @@
 #include <linux/async.h>
 #include <linux/kmemcheck.h>
 #include <linux/kmemtrace.h>
+#include <linux/sfi.h>
 #include <linux/shmem_fs.h>
 #include <trace/boot.h>
 
@@ -689,6 +690,7 @@ asmlinkage void __init start_kernel(void)
        check_bugs();
 
        acpi_early_init(); /* before LAPIC and SMP init */
+       sfi_init_late();
 
        ftrace_init();