Merge branch 'linus' into sfi-release

[mirror_ubuntu-bionic-kernel.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 34971becbd3c6f2db9e011c9c09f070e7eaf3c71..a2086913a17b1da939d9ae111ae28e087f4dfe49 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();