diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-01-31 15:08:43 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-01-31 15:09:14 +0100 |
| commit | 51563cd53c4b1c1790fccd2e0af0e2b756589af9 (patch) | |
| tree | d2fedfc654ab4fa011feaca262f95481a89e232a /arch/x86/include/asm/cpu.h | |
| parent | d123375425d7df4b6081a631fc1203fceafa59b2 (diff) | |
| parent | 8161239a8bcce9ad6b537c04a1fa3b5c68bae693 (diff) | |
| download | lwn-51563cd53c4b1c1790fccd2e0af0e2b756589af9.tar.gz lwn-51563cd53c4b1c1790fccd2e0af0e2b756589af9.zip | |
Merge branch 'tip/rtmutex' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into core/locking
*git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace tip/rtmutex:
rtmutex: Simplify PI algorithm and make highest prio task get lock
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); DECLARE_PER_CPU(int, cpu_state); +int __cpuinit mwait_usable(const struct cpuinfo_x86 *); #endif /* _ASM_X86_CPU_H */ |