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

[linux.git] / arch / x86 / kernel / head64.c

diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 2590025e52c2740c5f3c39bcceeac185915e3ce5..c5e403f6d869e284c5e8c21785954b5d7e99d511 100644 (file)
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -26,6 +26,7 @@
 #include <asm/e820.h>
 #include <asm/bios_ebda.h>
 #include <asm/bootparam_utils.h>
+#include <asm/microcode.h>
 
 /*
  * Manage page tables very early on.
@@ -165,6 +166,11 @@ void __init x86_64_start_kernel(char * real_mode_data)
 
        copy_bootdata(__va(real_mode_data));
 
+       /*
+        * Load microcode early on BSP.
+        */
+       load_ucode_bsp();
+
        if (console_loglevel == 10)
                early_printk("Kernel alive\n");