Merge branch 'x86/espfix' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip...

[karo-tx-linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 17d47bcdf5733bfea3a8005ca655dc89c46933b2..0ec25157deef71160819c326e7c229d431c5de00 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -616,6 +616,10 @@ asmlinkage __visible void __init start_kernel(void)
 #ifdef CONFIG_X86
        if (efi_enabled(EFI_RUNTIME_SERVICES))
                efi_enter_virtual_mode();
+#endif
+#ifdef CONFIG_X86_ESPFIX64
+       /* Should be run before the first non-init thread is created */
+       init_espfix_bsp();
 #endif
        thread_info_cache_init();
        cred_init();