Merge tag 'v3.10.13' into lsk/v3.10/topic/kvm

[firefly-linux-kernel-4.4.55.git] / arch / arm / mm / init.c

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index afeaef7a8ffc36f4c5b3544f5addef809cf4984e..c12ae661d4ab6406c95dd1adbcc92415e5980985 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -600,7 +600,7 @@ void __init mem_init(void)
 
 #ifdef CONFIG_SA1111
        /* now that our DMA memory is actually so designated, we can free it */
-       free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, 0, NULL);
+       free_reserved_area(__va(PHYS_OFFSET), swapper_pg_dir, 0, NULL);
 #endif
 
        free_highpages();