diff options
| -rw-r--r-- | include/asm-x86/msr.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index 204a8a30fecf..3ca29ebebbb1 100644 --- a/include/asm-x86/msr.h +++ b/include/asm-x86/msr.h | |||
| @@ -57,10 +57,7 @@ static inline unsigned long long native_read_msr_safe(unsigned int msr, | |||
| 57 | ".section .fixup,\"ax\"\n\t" | 57 | ".section .fixup,\"ax\"\n\t" |
| 58 | "3: mov %3,%0 ; jmp 1b\n\t" | 58 | "3: mov %3,%0 ; jmp 1b\n\t" |
| 59 | ".previous\n\t" | 59 | ".previous\n\t" |
| 60 | ".section __ex_table,\"a\"\n" | 60 | _ASM_EXTABLE(2b,3b) |
| 61 | _ASM_ALIGN "\n\t" | ||
| 62 | _ASM_PTR " 2b,3b\n\t" | ||
| 63 | ".previous" | ||
| 64 | : "=r" (*err), EAX_EDX_RET(val, low, high) | 61 | : "=r" (*err), EAX_EDX_RET(val, low, high) |
| 65 | : "c" (msr), "i" (-EFAULT)); | 62 | : "c" (msr), "i" (-EFAULT)); |
| 66 | return EAX_EDX_VAL(val, low, high); | 63 | return EAX_EDX_VAL(val, low, high); |
| @@ -81,10 +78,7 @@ static inline int native_write_msr_safe(unsigned int msr, | |||
| 81 | ".section .fixup,\"ax\"\n\t" | 78 | ".section .fixup,\"ax\"\n\t" |
| 82 | "3: mov %4,%0 ; jmp 1b\n\t" | 79 | "3: mov %4,%0 ; jmp 1b\n\t" |
| 83 | ".previous\n\t" | 80 | ".previous\n\t" |
| 84 | ".section __ex_table,\"a\"\n" | 81 | _ASM_EXTABLE(2b,3b) |
| 85 | _ASM_ALIGN "\n\t" | ||
| 86 | _ASM_PTR " 2b,3b\n\t" | ||
| 87 | ".previous" | ||
| 88 | : "=a" (err) | 82 | : "=a" (err) |
| 89 | : "c" (msr), "0" (low), "d" (high), | 83 | : "c" (msr), "0" (low), "d" (high), |
| 90 | "i" (-EFAULT)); | 84 | "i" (-EFAULT)); |