x86: convert cpuinfo_x86 array to a per_cpu array

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / mce_64.c

diff --git a/arch/x86/kernel/mce_64.c b/arch/x86/kernel/mce_64.c
index a66d607f5b924e09d864120d1d656c3e1a1c2da0..2cf20de5becacd82d0c57d99da467c8a43a678e9 100644 (file)
--- a/arch/x86/kernel/mce_64.c
+++ b/arch/x86/kernel/mce_64.c
@@ -76,9 +76,6 @@ void mce_log(struct mce *mce)
        wmb();
        for (;;) {
                entry = rcu_dereference(mcelog.next);
-               /* The rmb forces the compiler to reload next in each
-                   iteration */
-               rmb();
                for (;;) {
                        /* When the buffer fills up discard new entries. Assume
                           that the earlier errors are the more interesting. */
@@ -698,8 +695,6 @@ static int __init mcheck_disable(char *str)
    mce=nobootlog Don't log MCEs from before booting. */
 static int __init mcheck_enable(char *str)
 {
-       if (*str == '=')
-               str++;
        if (!strcmp(str, "off"))
                mce_dont_init = 1;
        else if (!strcmp(str, "bootlog") || !strcmp(str,"nobootlog"))
@@ -712,7 +707,7 @@ static int __init mcheck_enable(char *str)
 }
 
 __setup("nomce", mcheck_disable);
-__setup("mce", mcheck_enable);
+__setup("mce=", mcheck_enable);
 
 /* 
  * Sysfs support
@@ -804,19 +799,33 @@ static __cpuinit int mce_create_device(unsigned int cpu)
 {
        int err;
        int i;
-       if (!mce_available(&cpu_data[cpu]))
+
+       if (!mce_available(&cpu_data(cpu)))
                return -EIO;
 
+       memset(&per_cpu(device_mce, cpu).kobj, 0, sizeof(struct kobject));
        per_cpu(device_mce,cpu).id = cpu;
        per_cpu(device_mce,cpu).cls = &mce_sysclass;
 
        err = sysdev_register(&per_cpu(device_mce,cpu));
+       if (err)
+               return err;
+
+       for (i = 0; mce_attributes[i]; i++) {
+               err = sysdev_create_file(&per_cpu(device_mce,cpu),
+                                        mce_attributes[i]);
+               if (err)
+                       goto error;
+       }
 
-       if (!err) {
-               for (i = 0; mce_attributes[i]; i++)
-                       sysdev_create_file(&per_cpu(device_mce,cpu),
-                               mce_attributes[i]);
+       return 0;
+error:
+       while (i--) {
+               sysdev_remove_file(&per_cpu(device_mce,cpu),
+                                  mce_attributes[i]);
        }
+       sysdev_unregister(&per_cpu(device_mce,cpu));
+
        return err;
 }
 
@@ -828,7 +837,6 @@ static void mce_remove_device(unsigned int cpu)
                sysdev_remove_file(&per_cpu(device_mce,cpu),
                        mce_attributes[i]);
        sysdev_unregister(&per_cpu(device_mce,cpu));
-       memset(&per_cpu(device_mce, cpu).kobj, 0, sizeof(struct kobject));
 }
 
 /* Get notified when a cpu comes on/off. Be hotplug friendly. */
@@ -836,18 +844,21 @@ static int
 mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 {
        unsigned int cpu = (unsigned long)hcpu;
+       int err = 0;
 
        switch (action) {
-       case CPU_ONLINE:
-       case CPU_ONLINE_FROZEN:
-               mce_create_device(cpu);
+       case CPU_UP_PREPARE:
+       case CPU_UP_PREPARE_FROZEN:
+               err = mce_create_device(cpu);
                break;
+       case CPU_UP_CANCELED:
+       case CPU_UP_CANCELED_FROZEN:
        case CPU_DEAD:
        case CPU_DEAD_FROZEN:
                mce_remove_device(cpu);
                break;
        }
-       return NOTIFY_OK;
+       return err ? NOTIFY_BAD : NOTIFY_OK;
 }
 
 static struct notifier_block mce_cpu_notifier = {
@@ -862,9 +873,13 @@ static __init int mce_init_device(void)
        if (!mce_available(&boot_cpu_data))
                return -EIO;
        err = sysdev_class_register(&mce_sysclass);
+       if (err)
+               return err;
 
        for_each_online_cpu(i) {
-               mce_create_device(i);
+               err = mce_create_device(i);
+               if (err)
+                       return err;
        }
 
        register_hotcpu_notifier(&mce_cpu_notifier);