diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 10:04:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 10:04:01 -0700 |
| commit | 6742259866d03d5bc19815441ba928e8378343dc (patch) | |
| tree | 3450a2e7c22777ca5ca4cb4944c4b2ed1f218805 /arch/x86/include/asm/processor.h | |
| parent | 20d9d9a0544436b1b8c94689c01d746d6bd5525c (diff) | |
| parent | dba69d1092e291e257fb5673a3ad0e4c87878ebc (diff) | |
| download | op-kernel-dev-6742259866d03d5bc19815441ba928e8378343dc.zip op-kernel-dev-6742259866d03d5bc19815441ba928e8378343dc.tar.gz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, kvm: Call restore_sched_clock_state() only after %gs is initialized
x86: Use -mno-avx when available
x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility
x86: Preserve lazy irq disable semantics in fixup_irqs()
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 7284c9a..4fa7dcc 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -974,16 +974,6 @@ extern bool cpu_has_amd_erratum(const int *); #define cpu_has_amd_erratum(x) (false) #endif /* CONFIG_CPU_SUP_AMD */ -#ifdef CONFIG_X86_32 -/* - * disable hlt during certain critical i/o operations - */ -#define HAVE_DISABLE_HLT -#endif - -void disable_hlt(void); -void enable_hlt(void); - void cpu_idle_wait(void); extern unsigned long arch_align_stack(unsigned long sp); |
