summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/smp.c
diff options
context:
space:
mode:
authorNathan Lynch2008-12-10 21:16:07 +0100
committerPaul Mackerras2008-12-21 04:21:14 +0100
commitb2ea25b958968c152c6fac0594f2c9aa8b59eb8d (patch)
treeacf73d999342933369b2a96de9c79e002dee471d /arch/powerpc/kernel/smp.c
parentpowerpc: Add of_find_next_cache_node() (diff)
downloadkernel-qcow2-linux-b2ea25b958968c152c6fac0594f2c9aa8b59eb8d.tar.gz
kernel-qcow2-linux-b2ea25b958968c152c6fac0594f2c9aa8b59eb8d.tar.xz
kernel-qcow2-linux-b2ea25b958968c152c6fac0594f2c9aa8b59eb8d.zip
powerpc: Convert cpu_to_l2cache() to of_find_next_cache_node()
The smp code uses cache information to populate cpu_core_map; change it to use common code for cache lookup. Signed-off-by: Nathan Lynch <ntl@pobox.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/smp.c')
-rw-r--r--arch/powerpc/kernel/smp.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index ffcb1779a220..8ac3f721d235 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -466,8 +466,7 @@ out:
static struct device_node *cpu_to_l2cache(int cpu)
{
struct device_node *np;
- const phandle *php;
- phandle ph;
+ struct device_node *cache;
if (!cpu_present(cpu))
return NULL;
@@ -476,13 +475,11 @@ static struct device_node *cpu_to_l2cache(int cpu)
if (np == NULL)
return NULL;
- php = of_get_property(np, "l2-cache", NULL);
- if (php == NULL)
- return NULL;
- ph = *php;
+ cache = of_find_next_cache_node(np);
+
of_node_put(np);
- return of_find_node_by_phandle(ph);
+ return cache;
}
/* Activate a secondary processor. */