diff options
Diffstat (limited to 'arch/i386/kernel/microcode.c')
-rw-r--r-- | arch/i386/kernel/microcode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c index 165f13158c6..d3fdf0057d8 100644 --- a/arch/i386/kernel/microcode.c +++ b/arch/i386/kernel/microcode.c | |||
@@ -70,6 +70,7 @@ | |||
70 | */ | 70 | */ |
71 | 71 | ||
72 | //#define DEBUG /* pr_debug */ | 72 | //#define DEBUG /* pr_debug */ |
73 | #include <linux/capability.h> | ||
73 | #include <linux/kernel.h> | 74 | #include <linux/kernel.h> |
74 | #include <linux/init.h> | 75 | #include <linux/init.h> |
75 | #include <linux/sched.h> | 76 | #include <linux/sched.h> |
@@ -165,7 +166,7 @@ static void collect_cpu_info (void *unused) | |||
165 | 166 | ||
166 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); | 167 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); |
167 | /* see notes above for revision 1.07. Apparent chip bug */ | 168 | /* see notes above for revision 1.07. Apparent chip bug */ |
168 | serialize_cpu(); | 169 | sync_core(); |
169 | /* get the current revision from MSR 0x8B */ | 170 | /* get the current revision from MSR 0x8B */ |
170 | rdmsr(MSR_IA32_UCODE_REV, val[0], uci->rev); | 171 | rdmsr(MSR_IA32_UCODE_REV, val[0], uci->rev); |
171 | pr_debug("microcode: collect_cpu_info : sig=0x%x, pf=0x%x, rev=0x%x\n", | 172 | pr_debug("microcode: collect_cpu_info : sig=0x%x, pf=0x%x, rev=0x%x\n", |
@@ -379,7 +380,7 @@ static void do_update_one (void * unused) | |||
379 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); | 380 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); |
380 | 381 | ||
381 | /* see notes above for revision 1.07. Apparent chip bug */ | 382 | /* see notes above for revision 1.07. Apparent chip bug */ |
382 | serialize_cpu(); | 383 | sync_core(); |
383 | 384 | ||
384 | /* get the current revision from MSR 0x8B */ | 385 | /* get the current revision from MSR 0x8B */ |
385 | rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]); | 386 | rdmsr(MSR_IA32_UCODE_REV, val[0], val[1]); |