diff options
author | Borislav Petkov <bp@suse.de> | 2013-03-20 14:07:24 (GMT) |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2013-04-02 17:12:52 (GMT) |
commit | e2604b49e8a8827e8bc5b61bc0c5a889e028fdad (patch) | |
tree | 43f39236ba314d50e31c02364dcd6c88e7c6cb10 /arch/x86/kernel/cpu | |
parent | 65fc985b37dc241c4db7cd32adcbc989193fe3c8 (diff) | |
download | linux-fsl-qoriq-e2604b49e8a8827e8bc5b61bc0c5a889e028fdad.tar.xz |
x86, cpu: Convert F00F bug detection
... to using the new facility and drop the cpuinfo_x86 member.
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1363788448-31325-3-git-send-email-bp@alien8.de
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/intel.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/proc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 1905ce9..1acdd42 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -209,11 +209,11 @@ static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c) * system. * Note that the workaround only should be initialized once... */ - c->f00f_bug = 0; + clear_cpu_bug(c, X86_BUG_F00F); if (!paravirt_enabled() && c->x86 == 5) { static int f00f_workaround_enabled; - c->f00f_bug = 1; + set_cpu_bug(c, X86_BUG_F00F); if (!f00f_workaround_enabled) { trap_init_f00f_bug(); printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n"); diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c index e280253..2d60b2b 100644 --- a/arch/x86/kernel/cpu/proc.c +++ b/arch/x86/kernel/cpu/proc.c @@ -35,7 +35,7 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c) "cpuid level\t: %d\n" "wp\t\t: %s\n", c->fdiv_bug ? "yes" : "no", - c->f00f_bug ? "yes" : "no", + static_cpu_has_bug(X86_BUG_F00F) ? "yes" : "no", c->coma_bug ? "yes" : "no", c->hard_math ? "yes" : "no", c->hard_math ? "yes" : "no", |