diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-31 23:23:29 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-09-01 00:15:23 +0200 |
| commit | 0cc0213e73af5963eca259c84876937c20689dbd (patch) | |
| tree | 2e3db62cc241269fbb3ee3313e568239cf4c9bd0 /arch/x86/kernel/msr.c | |
| parent | x86, msr: CFI annotations, cleanups for msr-reg.S (diff) | |
| download | linux-0cc0213e73af5963eca259c84876937c20689dbd.tar.xz linux-0cc0213e73af5963eca259c84876937c20689dbd.zip | |
x86, msr: Have the _safe MSR functions return -EIO, not -EFAULT
For some reason, the _safe MSR functions returned -EFAULT, not -EIO.
However, the only user which cares about the return code as anything
other than a boolean is the MSR driver, which wants -EIO. Change it
to -EIO across the board.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Alok Kataria <akataria@vmware.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'arch/x86/kernel/msr.c')
| -rw-r--r-- | arch/x86/kernel/msr.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index 98fd6cd4e3a4..2cfbb4b2c422 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c @@ -80,11 +80,8 @@ static ssize_t msr_read(struct file *file, char __user *buf, for (; count; count -= 8) { err = rdmsr_safe_on_cpu(cpu, reg, &data[0], &data[1]); - if (err) { - if (err == -EFAULT) /* Fix idiotic error code */ - err = -EIO; + if (err) break; - } if (copy_to_user(tmp, &data, 8)) { err = -EFAULT; break; @@ -115,11 +112,8 @@ static ssize_t msr_write(struct file *file, const char __user *buf, break; } err = wrmsr_safe_on_cpu(cpu, reg, data[0], data[1]); - if (err) { - if (err == -EFAULT) /* Fix idiotic error code */ - err = -EIO; + if (err) break; - } tmp += 2; bytes += 8; } |