Merge commit 'v2.6.28-rc8' into x86/doc

[linux-2.6.git] / arch / x86 / include / asm / msr.h

diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 478a9245aae137117b3d13240697a5625522c26c..397efa375581188a81a82f644b00b006cd4a2e54 100644 (file)
--- 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)
 {
        DECLARE_ARGS(val, low, high);
 
 {
        DECLARE_ARGS(val, low, high);
 

-       rdtsc_barrier();

        asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));
        asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));

-       rdtsc_barrier();

 
        return EAX_EDX_VAL(val, low, high);
 }
 
        return EAX_EDX_VAL(val, low, high);
 }