diff options
| author | Michael Neuling <mikey@neuling.org> | 2009-01-14 13:42:41 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-16 16:15:16 +1100 |
| commit | b60c31d85a2a2f1a9c8623f1fb56e2688aa1e2b1 (patch) | |
| tree | b9e4e94030df5a433dd897015133d6b24c4523c6 /arch/powerpc | |
| parent | 9ba0fdbfaed2e74005d87fab948c5522b86ff733 (diff) | |
| download | op-kernel-dev-b60c31d85a2a2f1a9c8623f1fb56e2688aa1e2b1.zip op-kernel-dev-b60c31d85a2a2f1a9c8623f1fb56e2688aa1e2b1.tar.gz | |
powerpc: Get the number of SLBs from "slb-size" property
The PAPR says that the property for specifying the number of SLBs should
be called "slb-size". We currently only look for "ibm,slb-size" because
this is what firmware actually presents.
This patch makes us look for the "slb-size" property as well and in
preference to the "ibm,slb-size". This should future proof us if
firmware changes to match PAPR.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index c09cffa..f00f831 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -590,6 +590,11 @@ static void __init check_cpu_slb_size(unsigned long node) { u32 *slb_size_ptr; + slb_size_ptr = of_get_flat_dt_prop(node, "slb-size", NULL); + if (slb_size_ptr != NULL) { + mmu_slb_size = *slb_size_ptr; + return; + } slb_size_ptr = of_get_flat_dt_prop(node, "ibm,slb-size", NULL); if (slb_size_ptr != NULL) { mmu_slb_size = *slb_size_ptr; |
