powerpc: Get the number of SLBs from "slb-size" property
authorMichael Neuling <mikey@neuling.org>
Wed, 14 Jan 2009 13:42:41 +0000 (13:42 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 16 Jan 2009 05:15:16 +0000 (16:15 +1100)
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>
arch/powerpc/kernel/prom.c

index c09cffafb6ee5f8f2697fd4f55a1cf991f5db9cf..f00f83109ab309bbe38cca6a989155795413d4a7 100644 (file)
@@ -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;