From: Max Asbock Date: Wed, 25 Jun 2008 21:45:28 +0000 (-0700) Subject: x86: shift bits the right way in native_read_tscp X-Git-Tag: v2.6.26-rc9~90^2~3 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41aefdcc98fdba47459eab67630293d67e855fc3;p=linux-2.6 x86: shift bits the right way in native_read_tscp native_read_tscp shifts the bits in the high order value in the wrong direction, the attached patch fixes that. Signed-off-by: Max Asbock Acked-by: Glauber Costa Signed-off-by: Ingo Molnar --- diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index 3707650a16..2b5f2c91db 100644 --- a/include/asm-x86/msr.h +++ b/include/asm-x86/msr.h @@ -18,7 +18,7 @@ static inline unsigned long long native_read_tscp(unsigned int *aux) unsigned long low, high; asm volatile(".byte 0x0f,0x01,0xf9" : "=a" (low), "=d" (high), "=c" (*aux)); - return low | ((u64)high >> 32); + return low | ((u64)high << 32); } /*