diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 16:04:48 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 16:04:48 -0500 |
| commit | 78f902ccc597d6ce3e8d1477d70f2d79e960ba7a (patch) | |
| tree | c6ceab663de16501d1dda1c1596fe2dacaaef8e3 /arch/x86/include/asm/msr.h | |
| parent | 9ee670fd87b7d69c8633b94c42aadcbbcb96f28e (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
Merge commit 'v2.6.28-rc8' into x86/doc
Diffstat (limited to 'arch/x86/include/asm/msr.h')
| -rw-r--r-- | arch/x86/include/asm/msr.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 478a9245aae1..397efa375581 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h | |||
| @@ -108,9 +108,7 @@ static __always_inline unsigned long long __native_read_tsc(void) | |||
| 108 | { | 108 | { |
| 109 | DECLARE_ARGS(val, low, high); | 109 | DECLARE_ARGS(val, low, high); |
| 110 | 110 | ||
| 111 | rdtsc_barrier(); | ||
| 112 | asm volatile("rdtsc" : EAX_EDX_RET(val, low, high)); | 111 | asm volatile("rdtsc" : EAX_EDX_RET(val, low, high)); |
| 113 | rdtsc_barrier(); | ||
| 114 | 112 | ||
| 115 | return EAX_EDX_VAL(val, low, high); | 113 | return EAX_EDX_VAL(val, low, high); |
| 116 | } | 114 | } |