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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user