Commit 319e0b4f authored Jul 09, 2013 by Russell King

ARM: mm: fix boot on SA1110 Assabet



Commit 83db0384 (mm/ARM: use common help functions to free reserved
pages) broke booting on the Assabet by trying to convert a PFN to
a virtual address using the __va() macro.  This macro takes the
physical address, not a PFN.  Fix this.

Cc: <stable@vger.kernel.org> # 3.10
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent ee4de5d9

arch/arm/mm/init.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();