iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, cpu: Fix X86_FEATURE_NOPL
  x86, cpu: Re-run get_cpu_cap() after adjusting the CPUID level
This commit is contained in:
Linus Torvalds 2010-10-21 13:18:36 -07:00
commit bf70030dc0
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/x86/kernel/cpu/common.c
View File

@ -704,16 +704,21 @@ void __init early_cpu_init(void)
} }
/* /*
* The NOPL instruction is supposed to exist on all CPUs with * The NOPL instruction is supposed to exist on all CPUs of family >= 6;
* family >= 6; unfortunately, that's not true in practice because * unfortunately, that's not true in practice because of early VIA
* of early VIA chips and (more importantly) broken virtualizers that * chips and (more importantly) broken virtualizers that are not easy
* are not easy to detect. In the latter case it doesn't even *fail* * to detect. In the latter case it doesn't even *fail* reliably, so
* reliably, so probing for it doesn't even work. Disable it completely * probing for it doesn't even work. Disable it completely on 32-bit
* unless we can find a reliable way to detect all the broken cases. * unless we can find a reliable way to detect all the broken cases.
* Enable it explicitly on 64-bit for non-constant inputs of cpu_has().
*/ */
static void __cpuinit detect_nopl(struct cpuinfo_x86 *c) static void __cpuinit detect_nopl(struct cpuinfo_x86 *c)
{ {
#ifdef CONFIG_X86_32
clear_cpu_cap(c, X86_FEATURE_NOPL); clear_cpu_cap(c, X86_FEATURE_NOPL);
#else
set_cpu_cap(c, X86_FEATURE_NOPL);
#endif
} }
static void __cpuinit generic_identify(struct cpuinfo_x86 *c) static void __cpuinit generic_identify(struct cpuinfo_x86 *c)

1
arch/x86/kernel/cpu/cpu.h
View File

@ -32,6 +32,7 @@ struct cpu_dev {
extern const struct cpu_dev *const __x86_cpu_dev_start[], extern const struct cpu_dev *const __x86_cpu_dev_start[],
*const __x86_cpu_dev_end[]; *const __x86_cpu_dev_end[];
extern void get_cpu_cap(struct cpuinfo_x86 *c);
extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c); extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c);
extern void get_cpu_cap(struct cpuinfo_x86 *c); extern void get_cpu_cap(struct cpuinfo_x86 *c);