aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-23 10:35:52 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-23 12:56:57 +1000
commit3fdfd99051fbc210464378cd44a4b8914282bac3 (patch)
tree40c58068f5b89509c6d4fd8aa8c35e031dbc9820 /arch/powerpc/kernel
parent4b8692c022a4b149d0c2cc3f4f7a363453fde72a (diff)
downloadkernel_samsung_smdk4412-3fdfd99051fbc210464378cd44a4b8914282bac3.zip
kernel_samsung_smdk4412-3fdfd99051fbc210464378cd44a4b8914282bac3.tar.gz
kernel_samsung_smdk4412-3fdfd99051fbc210464378cd44a4b8914282bac3.tar.bz2
powerpc: Fix erroneous lmb->memblock conversions
Oooops... we missed these. We incorrectly converted strings used when parsing the device-tree on pseries, thus breaking access to drconf memory and hotplug memory. While at it, also revert some variable names that represent something the FW calls "lmb" and thus don't need to be converted to "memblock". Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> ---
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/prom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 9d39539..fed9bf6 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -414,7 +414,7 @@ static int __init early_init_dt_scan_drconf_memory(unsigned long node)
u64 base, size, memblock_size;
unsigned int is_kexec_kdump = 0, rngs;
- ls = of_get_flat_dt_prop(node, "ibm,memblock-size", &l);
+ ls = of_get_flat_dt_prop(node, "ibm,lmb-size", &l);
if (ls == NULL || l < dt_root_size_cells * sizeof(__be32))
return 0;
memblock_size = dt_mem_next_cell(dt_root_size_cells, &ls);