Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Asbock <masbock@us.ibm.com>2008-06-30 18:17:09 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-02 20:46:16 -0700
commit8ede7cd02adbd93b00f7097e38c7d3ee0c21f3f0 (patch)
tree63af0354beaf081e69cfd263e5278c64b1a344d0
parent712a9da4d9f05a918152422bbc30b601f892b62c (diff)
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 <masbock@linux.vnet.ibm.com> Acked-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--include/asm-x86/msr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h
index 3ca29ebebbb1..84a15b6977cc 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);
}
/*