diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-07-09 09:52:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-21 18:21:35 -0700 |
| commit | 9131e72c764bd7ea9554392edab26a368a765c4d (patch) | |
| tree | 39908d14a52c2f365ce7a1d5ab0964422d40b809 /arch | |
| parent | 65e9f76985abdf9198deae2231648d7e5408caf0 (diff) | |
| download | lwn-9131e72c764bd7ea9554392edab26a368a765c4d.tar.gz lwn-9131e72c764bd7ea9554392edab26a368a765c4d.zip | |
ARM: mm: fix boot on SA1110 Assabet
commit 319e0b4f02f73983c03a2ca38595fc6367929edf upstream.
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.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -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(); |