aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/sysfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel/sysfs.c')
-rw-r--r--arch/powerpc/kernel/sysfs.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 338491d1604a..412ad00e222d 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -348,23 +348,13 @@ static SYSDEV_ATTR(physical_id, 0444, show_physical_id, NULL);
348static int __init topology_init(void) 348static int __init topology_init(void)
349{ 349{
350 int cpu; 350 int cpu;
351 struct node *parent = NULL;
352 351
353 register_nodes(); 352 register_nodes();
354
355 register_cpu_notifier(&sysfs_cpu_nb); 353 register_cpu_notifier(&sysfs_cpu_nb);
356 354
357 for_each_possible_cpu(cpu) { 355 for_each_possible_cpu(cpu) {
358 struct cpu *c = &per_cpu(cpu_devices, cpu); 356 struct cpu *c = &per_cpu(cpu_devices, cpu);
359 357
360#ifdef CONFIG_NUMA
361 /* The node to which a cpu belongs can't be known
362 * until the cpu is made present.
363 */
364 parent = NULL;
365 if (cpu_present(cpu))
366 parent = &node_devices[cpu_to_node(cpu)];
367#endif
368 /* 358 /*
369 * For now, we just see if the system supports making 359 * For now, we just see if the system supports making
370 * the RTAS calls for CPU hotplug. But, there may be a 360 * the RTAS calls for CPU hotplug. But, there may be a
@@ -376,7 +366,7 @@ static int __init topology_init(void)
376 c->no_control = 1; 366 c->no_control = 1;
377 367
378 if (cpu_online(cpu) || (c->no_control == 0)) { 368 if (cpu_online(cpu) || (c->no_control == 0)) {
379 register_cpu(c, cpu, parent); 369 register_cpu(c, cpu);
380 370
381 sysdev_create_file(&c->sysdev, &attr_physical_id); 371 sysdev_create_file(&c->sysdev, &attr_physical_id);
382 } 372 }