author | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 21 Oct 2010 20:18:36 +0000 (13:18 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 21 Oct 2010 20:18:36 +0000 (13:18 -0700) |
* '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
x86, cpu: Fix X86_FEATURE_NOPL
x86, cpu: Re-run get_cpu_cap() after adjusting the CPUID level
1 | 2 | |||
---|---|---|---|---|
arch/x86/kernel/cpu/common.c | patch | | diff1 | | diff2 | | blob | history |
arch/x86/kernel/cpu/cpu.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/x86/kernel/cpu/common.c
Simple merge
diff --cc arch/x86/kernel/cpu/cpu.h
index f668bb1f7d432811bc3f773d777ca2596b6f6e33,c16456bc11a74c96ed81b17e92d06cf16303af46..e765633f210ed893f56bc23ba26e6cfea6c074fd
extern const struct cpu_dev *const __x86_cpu_dev_start[],
*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 get_cpu_cap(struct cpuinfo_x86 *c);
#endif