[PATCH] i386: change the 'no_control' field to 'hotpluggable' in the struct cpu

Change the 'no_control' field in the cpu struct to a more positive
and better term 'hotpluggable'. And change(/cleanup) the logic accordingly.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Li, Shaohua" <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 22123a0d5416..63ed265b7f09 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -239,7 +239,7 @@ static void unregister_cpu_online(unsigned int cpu)
         struct cpu *c = &per_cpu(cpu_devices, cpu);
         struct sys_device *s = &c->sysdev;
 
-        BUG_ON(c->no_control);
+        BUG_ON(!c->hotpluggable);
 
         if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
                         cpu_has_feature(CPU_FTR_SMT))
@@ -424,10 +424,10 @@ static int __init topology_init(void)
                  * CPU.  For instance, the boot cpu might never be valid
                  * for hotplugging.
                  */
-                if (!ppc_md.cpu_die)
-                        c->no_control = 1;
+                if (ppc_md.cpu_die)
+                        c->hotpluggable = 1;
 
-                if (cpu_online(cpu) || (c->no_control == 0)) {
+                if (cpu_online(cpu) || c->hotpluggable) {
                         register_cpu(c, cpu);
 
                         sysdev_create_file(&c->sysdev, &attr_physical_id);