i386: do cpuid_device_create() in CPU_UP_PREPARE instead of CPU_ONLINE.

[linux-2.6] / arch / x86 / kernel / cpuid.c

diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 5c2faa10e9fac42f604d0af086af0618835c289d..2086c727fb090c46478c77ae498d922f48a7fe5a 100644 (file)
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -11,8 +11,6 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * cpuid.c
- *
  * x86 CPUID access device
  *
  * This device is accessed by lseek() to the appropriate CPUID level
@@ -45,8 +43,6 @@
 
 static struct class *cpuid_class;
 
-#ifdef CONFIG_SMP
-
 struct cpuid_command {
        u32 reg;
        u32 *data;
@@ -64,26 +60,12 @@ static inline void do_cpuid(int cpu, u32 reg, u32 * data)
 {
        struct cpuid_command cmd;
 
-       preempt_disable();
-       if (cpu == smp_processor_id()) {
-               cpuid(reg, &data[0], &data[1], &data[2], &data[3]);
-       } else {
-               cmd.reg = reg;
-               cmd.data = data;
+       cmd.reg = reg;
+       cmd.data = data;
 
-               smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1, 1);
-       }
-       preempt_enable();
-}
-#else                          /* ! CONFIG_SMP */
-
-static inline void do_cpuid(int cpu, u32 reg, u32 * data)
-{
-       cpuid(reg, &data[0], &data[1], &data[2], &data[3]);
+       smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1, 1);
 }
 
-#endif                         /* ! CONFIG_SMP */
-
 static loff_t cpuid_seek(struct file *file, loff_t offset, int orig)
 {
        loff_t ret;
@@ -152,32 +134,40 @@ static const struct file_operations cpuid_fops = {
        .open = cpuid_open,
 };
 
-static int cpuid_device_create(int i)
+static __cpuinit int cpuid_device_create(int cpu)
 {
-       int err = 0;
        struct device *dev;
 
-       dev = device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, i), "cpu%d",i);
-       if (IS_ERR(dev))
-               err = PTR_ERR(dev);
-       return err;
+       dev = device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu),
+                           "cpu%d", cpu);
+       return IS_ERR(dev) ? PTR_ERR(dev) : 0;
 }
 
-static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+static void cpuid_device_destroy(int cpu)
+{
+       device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
+}
+
+static int __cpuinit cpuid_class_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:
-               cpuid_device_create(cpu);
+       case CPU_UP_PREPARE:
+       case CPU_UP_PREPARE_FROZEN:
+               err = cpuid_device_create(cpu);
                break;
+       case CPU_UP_CANCELED:
+       case CPU_UP_CANCELED_FROZEN:
        case CPU_DEAD:
        case CPU_DEAD_FROZEN:
-               device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
+               cpuid_device_destroy(cpu);
                break;
        }
-       return NOTIFY_OK;
+       return err ? NOTIFY_BAD : NOTIFY_OK;
 }
 
 static struct notifier_block __cpuinitdata cpuid_class_cpu_notifier =
@@ -214,7 +204,7 @@ static int __init cpuid_init(void)
 out_class:
        i = 0;
        for_each_online_cpu(i) {
-               device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, i));
+               cpuid_device_destroy(i);
        }
        class_destroy(cpuid_class);
 out_chrdev:
@@ -228,7 +218,7 @@ static void __exit cpuid_exit(void)
        int cpu = 0;
 
        for_each_online_cpu(cpu)
-               device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
+               cpuid_device_destroy(cpu);
        class_destroy(cpuid_class);
        unregister_chrdev(CPUID_MAJOR, "cpu/cpuid");
        unregister_hotcpu_notifier(&cpuid_class_cpu_notifier);