diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-07-22 13:32:24 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2016-07-25 12:42:53 -0400 |
commit | 258a1605c78878ada00417de4840c4c427673ffa (patch) | |
tree | 21434fcc1fb582270f60cf405b922b34e9895aaf /arch/arm64/mm | |
parent | a95b0644b38c16c40b753224671b919b9af0b73c (diff) |
arm64: mm: make create_mapping_late() non-allocating
The only purpose served by create_mapping_late() is to remap the already
mapped .text and .rodata kernel segments with read-only permissions. Since
we no longer allow block mappings to be split or merged,
create_mapping_late() should not pass an allocation function pointer into
__create_pgd_mapping(). So pass NULL instead.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laura Abbott <labbott@redhat.com>
Tested-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/mm')
-rw-r--r-- | arch/arm64/mm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index a96a2413fa18..33f36cede02d 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c | |||
@@ -312,7 +312,7 @@ static void create_mapping_late(phys_addr_t phys, unsigned long virt, | |||
312 | } | 312 | } |
313 | 313 | ||
314 | __create_pgd_mapping(init_mm.pgd, phys, virt, size, prot, | 314 | __create_pgd_mapping(init_mm.pgd, phys, virt, size, prot, |
315 | late_pgtable_alloc, !debug_pagealloc_enabled()); | 315 | NULL, !debug_pagealloc_enabled()); |
316 | } | 316 | } |
317 | 317 | ||
318 | static void __init __map_memblock(pgd_t *pgd, phys_addr_t start, phys_addr_t end) | 318 | static void __init __map_memblock(pgd_t *pgd, phys_addr_t start, phys_addr_t end) |