diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-24 14:24:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-24 14:24:12 -0500 |
| commit | 4398f31ca7989cbddca96267e3d018d440bac30e (patch) | |
| tree | 77b59bd0b224107970f18c63299e58ffc63ff532 /arch/x86/include/asm/cpu.h | |
| parent | d315777b32a4696feb86f2a0c9e9f39c94683649 (diff) | |
| parent | 8969691343354bdd80eff5405a0f879edbf013d6 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix jump label with RO/NX module protection crash
x86, hotplug: Fix powersavings with offlined cores on AMD
x86, mcheck, therm_throt.c: Export symbol platform_thermal_notify to allow coretemp to handler intr
x86: Use asm-generic/cacheflush.h
x86: Update CPU cache attributes table descriptors
Diffstat (limited to 'arch/x86/include/asm/cpu.h')
| -rw-r--r-- | arch/x86/include/asm/cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index 4fab24de26b1..6e6e7558e702 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h | |||
| @@ -32,5 +32,6 @@ extern void arch_unregister_cpu(int); | |||
| 32 | 32 | ||
| 33 | DECLARE_PER_CPU(int, cpu_state); | 33 | DECLARE_PER_CPU(int, cpu_state); |
| 34 | 34 | ||
| 35 | int __cpuinit mwait_usable(const struct cpuinfo_x86 *); | ||
| 35 | 36 | ||
| 36 | #endif /* _ASM_X86_CPU_H */ | 37 | #endif /* _ASM_X86_CPU_H */ |