Skip to content

Commit

Permalink
ARM: mm: fix boot on SA1110 Assabet
Browse files Browse the repository at this point in the history
Commit 83db038 (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>
  • Loading branch information
Russell King committed Jul 9, 2013
1 parent ee4de5d commit 319e0b4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 319e0b4

Please sign in to comment.