]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc: Fix erroneous lmb->memblock conversions
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 23 Jul 2010 00:35:52 +0000 (10:35 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 23 Jul 2010 02:56:57 +0000 (12:56 +1000)
commit4f3eadd22f873fa47fba05dbf002c322bb1a58c2
tree40c58068f5b89509c6d4fd8aa8c35e031dbc9820
parentfebbbcffbdb88bb73853b49b3937d46c7548da81
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>
---
arch/powerpc/kernel/prom.c
arch/powerpc/mm/numa.c
arch/powerpc/platforms/pseries/hotplug-memory.c