projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[deliverable/linux.git]
/
arch
/
x86
/
include
/
asm
/
system.h
diff --git
a/arch/x86/include/asm/system.h
b/arch/x86/include/asm/system.h
index 1db9bd2281d7bf2fb45a4aae625aedcc8ab9aaff..33ecc3ea8782add8f88e68405d227ee4af700134 100644
(file)
--- a/
arch/x86/include/asm/system.h
+++ b/
arch/x86/include/asm/system.h
@@
-451,7
+451,7
@@
void stop_this_cpu(void *dummy);
*
* (Could use an alternative three way for this if there was one.)
*/
*
* (Could use an alternative three way for this if there was one.)
*/
-static inline void rdtsc_barrier(void)
+static
__always_
inline void rdtsc_barrier(void)
{
alternative(ASM_NOP3, "mfence", X86_FEATURE_MFENCE_RDTSC);
alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC);
{
alternative(ASM_NOP3, "mfence", X86_FEATURE_MFENCE_RDTSC);
alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC);
This page took
0.025628 seconds
and
5
git commands to generate.