diff options
-rw-r--r-- | arch/x86/include/asm/mwait.h | 2 | ||||
-rw-r--r-- | arch/x86/lib/delay.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h index e28f8b723b5c..9d5252c9685c 100644 --- a/arch/x86/include/asm/mwait.h +++ b/arch/x86/include/asm/mwait.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #define MWAIT_ECX_INTERRUPT_BREAK 0x1 | 21 | #define MWAIT_ECX_INTERRUPT_BREAK 0x1 |
22 | #define MWAITX_ECX_TIMER_ENABLE BIT(1) | 22 | #define MWAITX_ECX_TIMER_ENABLE BIT(1) |
23 | #define MWAITX_MAX_LOOPS ((u32)-1) | 23 | #define MWAITX_MAX_LOOPS ((u32)-1) |
24 | #define MWAITX_DISABLE_CSTATES 0xf | 24 | #define MWAITX_DISABLE_CSTATES 0xf0 |
25 | 25 | ||
26 | static inline void __monitor(const void *eax, unsigned long ecx, | 26 | static inline void __monitor(const void *eax, unsigned long ecx, |
27 | unsigned long edx) | 27 | unsigned long edx) |
diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c index b7375dc6898f..c126571e5e2e 100644 --- a/arch/x86/lib/delay.c +++ b/arch/x86/lib/delay.c | |||
@@ -113,8 +113,8 @@ static void delay_mwaitx(unsigned long __loops) | |||
113 | __monitorx(raw_cpu_ptr(&cpu_tss_rw), 0, 0); | 113 | __monitorx(raw_cpu_ptr(&cpu_tss_rw), 0, 0); |
114 | 114 | ||
115 | /* | 115 | /* |
116 | * AMD, like Intel, supports the EAX hint and EAX=0xf | 116 | * AMD, like Intel's MWAIT version, supports the EAX hint and |
117 | * means, do not enter any deep C-state and we use it | 117 | * EAX=0xf0 means, do not enter any deep C-state and we use it |
118 | * here in delay() to minimize wakeup latency. | 118 | * here in delay() to minimize wakeup latency. |
119 | */ | 119 | */ |
120 | __mwaitx(MWAITX_DISABLE_CSTATES, delay, MWAITX_ECX_TIMER_ENABLE); | 120 | __mwaitx(MWAITX_DISABLE_CSTATES, delay, MWAITX_ECX_TIMER_ENABLE); |