diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-30 17:56:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-30 17:56:57 +0200 |
| commit | bbad5d4750ab3b44a196f9bdd982972e41b7e520 (patch) | |
| tree | 357c30909ea7311daacc7e5e9e79c6d91a857d00 /include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
| parent | ptrace GET/SET FPXREGS broken (diff) | |
| download | linux-bbad5d4750ab3b44a196f9bdd982972e41b7e520.tar.xz linux-bbad5d4750ab3b44a196f9bdd982972e41b7e520.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ptrace GET/SET FPXREGS broken
x86: fix cpu hotplug crash
x86: section/warning fixes
x86: shift bits the right way in native_read_tscp
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); } /* |