diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-01-09 21:11:06 +0000 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-01-09 21:57:27 +0000 |
| commit | b67fe71208411b6996c4ff917f588cb7e79c56b5 (patch) | |
| tree | d4d5c048496e8d3b7c3b0365d251412312ec3aca | |
| parent | df77b65c1ce5164d7536b61de1a6499834f3f3e7 (diff) | |
mmu: Fix merge issue with create_mapping
Tixy noted:
The Android patch "ARM: allow the kernel text section to be made
read-only" is causing more problems. This patch modified
create_mapping() to take an extra argument and new code merged from
mainline doesn't supply this leading to build errors, specifically with
CONFIG_DEBUG_LL but there are also three other uses of create_mapping()
in conditionally compiled code which don't have the extra argument.
This patch resovles this issue.
Reported-by: Mark Hambleton via Jon Medhurst (Tixy) <tixy@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | arch/arm/mm/mmu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 14cd0fb0bfe6..59eeb5c20bde 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -910,7 +910,7 @@ void __init debug_ll_io_init(void) map.virtual &= PAGE_MASK; map.length = PAGE_SIZE; map.type = MT_DEVICE; - create_mapping(&map); + create_mapping(&map, false); } #endif @@ -1152,7 +1152,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc) map.virtual = MODULES_VADDR; map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK; map.type = MT_ROM; - create_mapping(&map); + create_mapping(&map, false); #endif /* @@ -1163,14 +1163,14 @@ static void __init devicemaps_init(struct machine_desc *mdesc) map.virtual = FLUSH_BASE; map.length = SZ_1M; map.type = MT_CACHECLEAN; - create_mapping(&map); + create_mapping(&map, false); #endif #ifdef FLUSH_BASE_MINICACHE map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M); map.virtual = FLUSH_BASE_MINICACHE; map.length = SZ_1M; map.type = MT_MINICLEAN; - create_mapping(&map); + create_mapping(&map, false); #endif /* |