Commit 319e0b4f authored by Russell King's avatar 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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ee4de5d9
...@@ -600,7 +600,7 @@ void __init mem_init(void) ...@@ -600,7 +600,7 @@ void __init mem_init(void)
#ifdef CONFIG_SA1111 #ifdef CONFIG_SA1111
/* now that our DMA memory is actually so designated, we can free it */ /* 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 #endif
free_highpages(); free_highpages();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment