From 8d1233f95d2b99a1b5f511125b8a76cba4356537 Mon Sep 17 00:00:00 2001 From: Nathan Lynch Date: Tue, 28 Jun 2005 20:55:25 +1000 Subject: [PATCH] --- yaml --- r: 4011 b: refs/heads/master c: f5f1cc5437961a4bd93d615099f26780819e72d3 h: refs/heads/master i: 4009: ec345f0abe1b84f2a846f8d7c0ae03f74128aa27 4007: 4214b7eed6f3db42214ac5cf58a1ae7c3fb7dba2 v: v3 --- [refs] | 2 +- trunk/arch/ppc64/kernel/sysfs.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b3b981ef17d9..bcf8ab87f37a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a341ad97245d01c923995cfe7deacd0c8aee6e16 +refs/heads/master: f5f1cc5437961a4bd93d615099f26780819e72d3 diff --git a/trunk/arch/ppc64/kernel/sysfs.c b/trunk/arch/ppc64/kernel/sysfs.c index c8fa6569b2fd..2f704a2cafb1 100644 --- a/trunk/arch/ppc64/kernel/sysfs.c +++ b/trunk/arch/ppc64/kernel/sysfs.c @@ -400,7 +400,12 @@ static int __init topology_init(void) struct cpu *c = &per_cpu(cpu_devices, cpu); #ifdef CONFIG_NUMA - parent = &node_devices[cpu_to_node(cpu)]; + /* The node to which a cpu belongs can't be known + * until the cpu is made present. + */ + parent = NULL; + if (cpu_present(cpu)) + parent = &node_devices[cpu_to_node(cpu)]; #endif /* * For now, we just see if the system supports making