Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next...

[linux-2.6-microblaze.git] / arch / arm / mm / init.c

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 6162a07..6d0cb0f 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -158,7 +158,7 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
                panic("Failed to steal %pa bytes at %pS\n",
                      &size, (void *)_RET_IP_);
 
-       memblock_free(phys, size);
+       memblock_phys_free(phys, size);
        memblock_remove(phys, size);
 
        return phys;