diff options
author | Siddha, Suresh B <suresh.b.siddha@intel.com> | 2006-12-06 20:14:10 -0500 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-06 20:14:10 -0500 |
commit | 72486f1f8f0a2bc828b9d30cf4690cf2dd6807fc (patch) | |
tree | d99077e8758eb7aa87554186a6ae81e9cd81589a /arch/powerpc | |
parent | fd6d7d26897dec834d0b9fbdc59819b0332a1257 (diff) |
[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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/sysfs.c | 8 |
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) | |||
239 | struct cpu *c = &per_cpu(cpu_devices, cpu); | 239 | struct cpu *c = &per_cpu(cpu_devices, cpu); |
240 | struct sys_device *s = &c->sysdev; | 240 | struct sys_device *s = &c->sysdev; |
241 | 241 | ||
242 | BUG_ON(c->no_control); | 242 | BUG_ON(!c->hotpluggable); |
243 | 243 | ||
244 | if (!firmware_has_feature(FW_FEATURE_ISERIES) && | 244 | if (!firmware_has_feature(FW_FEATURE_ISERIES) && |
245 | cpu_has_feature(CPU_FTR_SMT)) | 245 | cpu_has_feature(CPU_FTR_SMT)) |
@@ -424,10 +424,10 @@ static int __init topology_init(void) | |||
424 | * CPU. For instance, the boot cpu might never be valid | 424 | * CPU. For instance, the boot cpu might never be valid |
425 | * for hotplugging. | 425 | * for hotplugging. |
426 | */ | 426 | */ |
427 | if (!ppc_md.cpu_die) | 427 | if (ppc_md.cpu_die) |
428 | c->no_control = 1; | 428 | c->hotpluggable = 1; |
429 | 429 | ||
430 | if (cpu_online(cpu) || (c->no_control == 0)) { | 430 | if (cpu_online(cpu) || c->hotpluggable) { |
431 | register_cpu(c, cpu); | 431 | register_cpu(c, cpu); |
432 | 432 | ||
433 | sysdev_create_file(&c->sysdev, &attr_physical_id); | 433 | sysdev_create_file(&c->sysdev, &attr_physical_id); |