diff options
Diffstat (limited to 'arch/i386/kernel/msr.c')
| -rw-r--r-- | arch/i386/kernel/msr.c | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c index b2f03c39a6fe..03100d6fc5d6 100644 --- a/arch/i386/kernel/msr.c +++ b/arch/i386/kernel/msr.c | |||
| @@ -46,23 +46,13 @@ | |||
| 46 | 46 | ||
| 47 | static struct class *msr_class; | 47 | static struct class *msr_class; |
| 48 | 48 | ||
| 49 | /* Note: "err" is handled in a funny way below. Otherwise one version | ||
| 50 | of gcc or another breaks. */ | ||
| 51 | |||
| 52 | static inline int wrmsr_eio(u32 reg, u32 eax, u32 edx) | 49 | static inline int wrmsr_eio(u32 reg, u32 eax, u32 edx) |
| 53 | { | 50 | { |
| 54 | int err; | 51 | int err; |
| 55 | 52 | ||
| 56 | asm volatile ("1: wrmsr\n" | 53 | err = wrmsr_safe(reg, eax, edx); |
| 57 | "2:\n" | 54 | if (err) |
| 58 | ".section .fixup,\"ax\"\n" | 55 | err = -EIO; |
| 59 | "3: movl %4,%0\n" | ||
| 60 | " jmp 2b\n" | ||
| 61 | ".previous\n" | ||
| 62 | ".section __ex_table,\"a\"\n" | ||
| 63 | " .align 4\n" " .long 1b,3b\n" ".previous":"=&bDS" (err) | ||
| 64 | :"a"(eax), "d"(edx), "c"(reg), "i"(-EIO), "0"(0)); | ||
| 65 | |||
| 66 | return err; | 56 | return err; |
| 67 | } | 57 | } |
| 68 | 58 | ||
| @@ -70,18 +60,9 @@ static inline int rdmsr_eio(u32 reg, u32 *eax, u32 *edx) | |||
| 70 | { | 60 | { |
| 71 | int err; | 61 | int err; |
| 72 | 62 | ||
| 73 | asm volatile ("1: rdmsr\n" | 63 | err = rdmsr_safe(reg, eax, edx); |
| 74 | "2:\n" | 64 | if (err) |
| 75 | ".section .fixup,\"ax\"\n" | 65 | err = -EIO; |
| 76 | "3: movl %4,%0\n" | ||
| 77 | " jmp 2b\n" | ||
| 78 | ".previous\n" | ||
| 79 | ".section __ex_table,\"a\"\n" | ||
| 80 | " .align 4\n" | ||
| 81 | " .long 1b,3b\n" | ||
| 82 | ".previous":"=&bDS" (err), "=a"(*eax), "=d"(*edx) | ||
| 83 | :"c"(reg), "i"(-EIO), "0"(0)); | ||
| 84 | |||
| 85 | return err; | 66 | return err; |
| 86 | } | 67 | } |
| 87 | 68 | ||