diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-13 14:58:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-13 14:58:36 -0700 |
| commit | bfd65dd9fe42b54c6f4eabbabc40bda9e25dcf93 (patch) | |
| tree | 232c452b88dc5000bf1863e2bc033167c64a026e /arch/arm/mm/init.c | |
| parent | d1447464789918db1e1a3d0aaf50d3d0f6487a4f (diff) | |
| parent | cbbe6f82b489e7ceba4ad7c833bd3a76cd0084cb (diff) | |
| download | op-kernel-dev-bfd65dd9fe42b54c6f4eabbabc40bda9e25dcf93.zip op-kernel-dev-bfd65dd9fe42b54c6f4eabbabc40bda9e25dcf93.tar.gz | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"A few fixes for ARM, mostly just one liners with the exception of the
missing section specification. We decided not to rely on .previous to
fix this but to explicitly state the section we want the code to be
in."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7778/1: smp_twd: twd_update_frequency need be run on all online CPUs
ARM: 7782/1: Kconfig: Let ARM_ERRATA_364296 not depend on CONFIG_SMP
ARM: mm: fix boot on SA1110 Assabet
ARM: 7781/1: mmu: Add debug_ll_io_init() mappings to early mappings
ARM: 7780/1: add missing linker section markup to head-common.S
Diffstat (limited to 'arch/arm/mm/init.c')
| -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 6833cbe..15225d8 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -597,7 +597,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, -1, NULL); + free_reserved_area(__va(PHYS_OFFSET), swapper_pg_dir, -1, NULL); #endif free_highpages(); |
