diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-21 09:56:52 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-21 09:56:52 -0500 |
| commit | e7e37ee9c547213d726b29c2510cbb6696050405 (patch) | |
| tree | 50c45625de666b23f209d79eb1bfae05c64feee9 /include/asm-x86_64/msr.h | |
| parent | c243f1f1f6545985afcc6adf1fc085729029c3ee (diff) | |
| parent | db93a82fa9d8b4d6e31c227922eaae829253bb88 (diff) | |
Merge ../linus/
Diffstat (limited to 'include/asm-x86_64/msr.h')
| -rw-r--r-- | include/asm-x86_64/msr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/msr.h b/include/asm-x86_64/msr.h index 24dc39651bc4..10f8b51cec8b 100644 --- a/include/asm-x86_64/msr.h +++ b/include/asm-x86_64/msr.h | |||
| @@ -56,7 +56,7 @@ | |||
| 56 | ".section __ex_table,\"a\"\n" \ | 56 | ".section __ex_table,\"a\"\n" \ |
| 57 | " .align 8\n" \ | 57 | " .align 8\n" \ |
| 58 | " .quad 1b,3b\n" \ | 58 | " .quad 1b,3b\n" \ |
| 59 | ".previous":"=&bDS" (ret__), "=a"(a), "=d"(b)\ | 59 | ".previous":"=&bDS" (ret__), "=a"(*(a)), "=d"(*(b))\ |
| 60 | :"c"(msr), "i"(-EIO), "0"(0)); \ | 60 | :"c"(msr), "i"(-EIO), "0"(0)); \ |
| 61 | ret__; }) | 61 | ret__; }) |
| 62 | 62 | ||