Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c09ec06 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

arm64: use 'segment' rather than 'chunk' to describe mapped kernel regions 



Replace the poorly defined term chunk with segment, which is a term that is
already used by the ELF spec to describe contiguous mappings with the same
permission attributes of statically allocated ranges of an executable.

Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 9f287591

arch/arm64/mm/mmu.c

+7 −7
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ void fixup_init(void) 
	unmap_kernel_range((u64)__init_begin, (u64)(__init_end - __init_begin));

}



static void __init map_kernel_chunk(pgd_t *pgd, void *va_start, void *va_end,

static void __init map_kernel_segment(pgd_t *pgd, void *va_start, void *va_end,

				      pgprot_t prot, struct vm_struct *vma)

{

	phys_addr_t pa_start = __pa(va_start);
@@ -499,11 +499,11 @@ static void __init map_kernel(pgd_t *pgd) 
{

	static struct vm_struct vmlinux_text, vmlinux_rodata, vmlinux_init, vmlinux_data;



	map_kernel_chunk(pgd, _stext, __start_rodata, PAGE_KERNEL_EXEC, &vmlinux_text);

	map_kernel_chunk(pgd, __start_rodata, _etext, PAGE_KERNEL, &vmlinux_rodata);

	map_kernel_chunk(pgd, __init_begin, __init_end, PAGE_KERNEL_EXEC,

	map_kernel_segment(pgd, _stext, __start_rodata, PAGE_KERNEL_EXEC, &vmlinux_text);

	map_kernel_segment(pgd, __start_rodata, _etext, PAGE_KERNEL, &vmlinux_rodata);

	map_kernel_segment(pgd, __init_begin, __init_end, PAGE_KERNEL_EXEC,

			   &vmlinux_init);

	map_kernel_chunk(pgd, _data, _end, PAGE_KERNEL, &vmlinux_data);

	map_kernel_segment(pgd, _data, _end, PAGE_KERNEL, &vmlinux_data);



	if (!pgd_val(*pgd_offset_raw(pgd, FIXADDR_START))) {

		/*