Merge branch 'linus' into sfi-release

[mirror_ubuntu-bionic-kernel.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index a55f6609fe1fae46dcf5e5a9518be0de01681c6f..6c7886890fa6ed1b1f57464bf1114f1ec044989c 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -27,6 +27,7 @@
 #include <linux/screen_info.h>
 #include <linux/ioport.h>
 #include <linux/acpi.h>
+#include <linux/sfi.h>
 #include <linux/apm_bios.h>
 #include <linux/initrd.h>
 #include <linux/bootmem.h>
@@ -985,6 +986,8 @@ void __init setup_arch(char **cmdline_p)
         */
        acpi_boot_init();
 
+       sfi_init();
+
        /*
         * get boot-time SMP configuration:
         */