From 77c87c7725fbb004875da876c7e4f0750634f93a Mon Sep 17 00:00:00 2001 From: Fenghua Yu Date: Thu, 20 Dec 2012 23:44:30 -0800 Subject: [PATCH] --- yaml --- r: 356275 b: refs/heads/master c: feddc9de8bf69415da6f96eca0219186b70d145a h: refs/heads/master i: 356273: bcf9de33ac40df1a4ac3d68265aa517e26d87e77 356271: 55c214ce2fc702fcc15dc2a3ef3c864f29d47f12 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/head64.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6a571ece02d6..4f13e6202358 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63b553c68db5a8d4febcd1010b194333d2b02e1c +refs/heads/master: feddc9de8bf69415da6f96eca0219186b70d145a diff --git a/trunk/arch/x86/kernel/head64.c b/trunk/arch/x86/kernel/head64.c index 57334f4cd3af..3ff35705fa6e 100644 --- a/trunk/arch/x86/kernel/head64.c +++ b/trunk/arch/x86/kernel/head64.c @@ -26,6 +26,7 @@ #include #include #include +#include /* * Manage page tables very early on. @@ -170,6 +171,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");