diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-30 11:56:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-30 11:56:57 -0400 |
| commit | bbad5d4750ab3b44a196f9bdd982972e41b7e520 (patch) | |
| tree | 357c30909ea7311daacc7e5e9e79c6d91a857d00 /include | |
| parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) | |
| parent | 11dbc963a8f6128595d0f6ecf138dc369e144997 (diff) | |
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) | |||
| 18 | unsigned long low, high; | 18 | unsigned long low, high; |
| 19 | asm volatile(".byte 0x0f,0x01,0xf9" | 19 | asm volatile(".byte 0x0f,0x01,0xf9" |
| 20 | : "=a" (low), "=d" (high), "=c" (*aux)); | 20 | : "=a" (low), "=d" (high), "=c" (*aux)); |
| 21 | return low | ((u64)high >> 32); | 21 | return low | ((u64)high << 32); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | /* | 24 | /* |