lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: msr: propagate errors from smp_call_function_single()

Browse Source 
Propagate error (-ENXIO) from smp_call_function_single().  These
errors can happen when a CPU is unplugged while the MSR driver is
open.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin
2008-08-25 17:27:21 -07:00
parent f73be6dedf
commit c6f31932d0
3 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/kernel/msr.c
View File

@@ -79,8 +79,11 @@ 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)
return -EIO;
if (err) {
if (err == -EFAULT) /* Fix idiotic error code */
err = -EIO;
return err;
}
if (copy_to_user(tmp, &data, 8))
return -EFAULT;
tmp += 2;
@@ -105,8 +108,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
if (copy_from_user(&data, tmp, 8))
return -EFAULT;
err = wrmsr_safe_on_cpu(cpu, reg, data[0], data[1]);
if (err)
return -EIO;
if (err) {
if (err == -EFAULT) /* Fix idiotic error code */
err = -EIO;
return err;
}
tmp += 2;
}