diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-07-09 12:52:55 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-07-09 12:52:55 +0400 |
| commit | 319e0b4f02f73983c03a2ca38595fc6367929edf (patch) | |
| tree | e16e07b529da5b72bf77329976dc28239aaaf1ce /arch/arm/mm | |
| parent | ee4de5d99aeac44f4507b7538b2b3faedc5205b9 (diff) | |
| download | linux-319e0b4f02f73983c03a2ca38595fc6367929edf.tar.xz | |
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>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 9a5cdc01fcdf..0ecc43fd6229 100644 --- 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(); |