diff options
| author | Max Asbock <masbock@us.ibm.com> | 2008-06-25 23:45:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-26 14:49:17 +0200 |
| commit | 41aefdcc98fdba47459eab67630293d67e855fc3 (patch) | |
| tree | 988cd338a7cee77bc06338f71ce4909f296a8f60 /include | |
| parent | xen: remove support for non-PAE 32-bit (diff) | |
| download | linux-41aefdcc98fdba47459eab67630293d67e855fc3.tar.xz linux-41aefdcc98fdba47459eab67630293d67e855fc3.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/msr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index 3707650a169b..2b5f2c91db25 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); } /* |