aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob.Shin@amd.com <Jacob.Shin@amd.com>2005-11-20 18:49:07 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-20 11:52:59 -0800
commite6c667592e824c2871fe0ae3bc4b9bc7e81941f4 (patch)
treee62fee402509ad4f446a06dec0564462a5e04fae
parentfbe83e209ad9c8281e29ac17a60f91119d86fa8c (diff)
[PATCH] Fix x86_64/msr.h interface to agree with i386/msr.h
Ever since we remove msr.c from x86_64 branch and started grabbing it from i386, msr device (read functionality) has been broken for us. This is due to the differences between asm-i386/msr.h and asm-x86_64/msr.h interfaces. Here is a patch to our side to fix this. Thankfully, as of current (2.6.15-rc1-git6) tree, arch/i386/kernel/msr.c is the only file that uses rdmsr_safe macro. Signed-off-by: Jacob Shin <jacob.shin@amd.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-x86_64/msr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/msr.h b/include/asm-x86_64/msr.h
index 24dc39651bc..10f8b51cec8 100644
--- a/include/asm-x86_64/msr.h
+++ b/include/asm-x86_64/msr.h
@@ -56,7 +56,7 @@
".section __ex_table,\"a\"\n" \
" .align 8\n" \
" .quad 1b,3b\n" \
- ".previous":"=&bDS" (ret__), "=a"(a), "=d"(b)\
+ ".previous":"=&bDS" (ret__), "=a"(*(a)), "=d"(*(b))\
:"c"(msr), "i"(-EIO), "0"(0)); \
ret__; })