From: Max Asbock Date: Mon, 30 Jun 2008 16:17:09 +0000 (+0200) Subject: x86: shift bits the right way in native_read_tscp X-Git-Tag: v2.6.25.10~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ede7cd02adbd93b00f7097e38c7d3ee0c21f3f0;p=thirdparty%2Fkernel%2Fstable.git x86: shift bits the right way in native_read_tscp Commit 41aefdcc98fdba47459eab67630293d67e855fc3 upstream 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index 3ca29ebebbb18..84a15b6977cc1 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); } /*