diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-08-13 00:22:28 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-08-13 00:22:28 +0100 |
commit | 7ac68a4c1de6aac5b0bb231fe6d8505ebe5686d9 (patch) | |
tree | 5a708c8cf6a18ec3c0395da8a136d61403e6f1e6 /arch/arm/mm | |
parent | 5b7cc3df955cf510a0d4174553fe0410f9fbdd4a (diff) | |
download | blackbird-op-linux-7ac68a4c1de6aac5b0bb231fe6d8505ebe5686d9.tar.gz blackbird-op-linux-7ac68a4c1de6aac5b0bb231fe6d8505ebe5686d9.zip |
ARM: Allow arm_memblock_steal() to remove memory from any RAM region
Allow arm_memblock_steal() to remove memory from any RAM region,
including highmem areas. This allows memory to be stolen from the
very top of declared memory, including highmem areas, rather than
our precious lowmem.
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 9aec41fa80ae..ad722f1208a5 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -324,7 +324,7 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align) BUG_ON(!arm_memblock_steal_permitted); - phys = memblock_alloc(size, align); + phys = memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ANYWHERE); memblock_free(phys, size); memblock_remove(phys, size); |