From 7c172804197e41025da3fe9893132286685f05ee Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 13 Aug 2012 00:22:28 +0100 Subject: [PATCH] --- yaml --- r: 331479 b: refs/heads/master c: 7ac68a4c1de6aac5b0bb231fe6d8505ebe5686d9 h: refs/heads/master i: 331477: dc0666c0c48692ff3fda4aaad5faa5c4191bb10b 331475: 29a299253f2d7fefd9f3dd1bcfbf64a8da95aac6 331471: ead64601451b7d77e329d1ce9356dca740f7943e v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a953830d85b8..fda854bbf1b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b7cc3df955cf510a0d4174553fe0410f9fbdd4a +refs/heads/master: 7ac68a4c1de6aac5b0bb231fe6d8505ebe5686d9 diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c index 9aec41fa80ae..ad722f1208a5 100644 --- a/trunk/arch/arm/mm/init.c +++ b/trunk/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);