x86: msr: propagate errors from smp_call_function_single()

[safe/jmp/linux-2.6] / arch / x86 / kernel / msr.c

diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 4dfb405..9c34a10 100644 (file)
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -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;
        }
 
@@ -117,13 +123,21 @@ static int msr_open(struct inode *inode, struct file *file)
 {
        unsigned int cpu = iminor(file->f_path.dentry->d_inode);
        struct cpuinfo_x86 *c = &cpu_data(cpu);
+       int ret = 0;
 
-       if (cpu >= NR_CPUS || !cpu_online(cpu))
-               return -ENXIO;  /* No such CPU */
-       if (!cpu_has(c, X86_FEATURE_MSR))
-               return -EIO;    /* MSR not supported */
+       lock_kernel();
+       cpu = iminor(file->f_path.dentry->d_inode);
 
-       return 0;
+       if (cpu >= NR_CPUS || !cpu_online(cpu)) {
+               ret = -ENXIO;   /* No such CPU */
+               goto out;
+       }
+       c = &cpu_data(cpu);
+       if (!cpu_has(c, X86_FEATURE_MSR))
+               ret = -EIO;     /* MSR not supported */
+out:
+       unlock_kernel();
+       return ret;
 }
 
 /*
@@ -141,8 +155,8 @@ static int __cpuinit msr_device_create(int cpu)
 {
        struct device *dev;
 
-       dev = device_create(msr_class, NULL, MKDEV(MSR_MAJOR, cpu),
-                           "msr%d", cpu);
+       dev = device_create_drvdata(msr_class, NULL, MKDEV(MSR_MAJOR, cpu),
+                                   NULL, "msr%d", cpu);
        return IS_ERR(dev) ? PTR_ERR(dev) : 0;
 }
 
@@ -162,12 +176,10 @@ static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
                err = msr_device_create(cpu);
                break;
        case CPU_UP_CANCELED:
+       case CPU_UP_CANCELED_FROZEN:
        case CPU_DEAD:
                msr_device_destroy(cpu);
                break;
-       case CPU_UP_CANCELED_FROZEN:
-               destroy_suspended_device(msr_class, MKDEV(MSR_MAJOR, cpu));
-               break;
        }
        return err ? NOTIFY_BAD : NOTIFY_OK;
 }