diff options
author | Paul Burton <paulburton@kernel.org> | 2019-11-01 14:35:49 -0700 |
---|---|---|
committer | Paul Burton <paulburton@kernel.org> | 2019-11-01 14:36:44 -0700 |
commit | 02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5 (patch) | |
tree | 20e69aae8d0acfcd7edc954e70a9d751e0b54a7e /arch/x86/lib/delay.c | |
parent | 8a5a499871308c093ced3c5a383b72502b96e0d2 (diff) | |
parent | b42aa3fd5957e4daf4b69129e5ce752a2a53e7d6 (diff) | |
download | lwn-02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5.tar.gz lwn-02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5.zip |
Merge tag 'mips_fixes_5.4_3' into mips-next
Pull in mips-fixes primarily to gain build fixes in order to allow
better testing of mips-next.
A few MIPS fixes:
- Fix VDSO time-related function behavior for systems where we need to
fall back to syscalls, but were instead returning bogus results.
- A fix to TLB exception handlers for Cavium Octeon systems where they
would inadvertently clobber the $1/$at register.
- A build fix for bcm63xx configurations.
- Switch to using my @kernel.org email address.
Signed-off-by: Paul Burton <paulburton@kernel.org>
Diffstat (limited to 'arch/x86/lib/delay.c')
-rw-r--r-- | arch/x86/lib/delay.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) __monitorx(raw_cpu_ptr(&cpu_tss_rw), 0, 0); /* - * AMD, like Intel, supports the EAX hint and EAX=0xf - * means, do not enter any deep C-state and we use it + * AMD, like Intel's MWAIT version, supports the EAX hint and + * EAX=0xf0 means, do not enter any deep C-state and we use it * here in delay() to minimize wakeup latency. */ __mwaitx(MWAITX_DISABLE_CSTATES, delay, MWAITX_ECX_TIMER_ENABLE); |