Commit 376f5a3b authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

arm64: mm: get rid of kimage_vaddr global variable 



We store the address of _text in kimage_vaddr, but since commit
09e3c22a ("arm64: Use a variable to store non-global mappings
decision"), we no longer reference this variable from modules so we no
longer need to export it.

In fact, we don't need it at all so let's just get rid of it.

Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20231129111555.3594833-46-ardb@google.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent a22fc8e1

arch/arm64/include/asm/memory.h

+2 −4
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ 
#include <linux/types.h>

#include <asm/boot.h>

#include <asm/bug.h>

#include <asm/sections.h>



#if VA_BITS > 48

extern u64			vabits_actual;
@@ -193,15 +194,12 @@ extern s64 memstart_addr; 
/* PHYS_OFFSET - the physical address of the start of memory. */

#define PHYS_OFFSET		({ VM_BUG_ON(memstart_addr & 1); memstart_addr; })



/* the virtual base of the kernel image */

extern u64			kimage_vaddr;



/* the offset between the kernel virtual and physical mappings */

extern u64			kimage_voffset;



static inline unsigned long kaslr_offset(void)

{

	return kimage_vaddr - KIMAGE_VADDR;

	return (u64)&_text - KIMAGE_VADDR;

}



#ifdef CONFIG_RANDOMIZE_BASE

arch/arm64/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ SYM_FUNC_START_LOCAL(__primary_switched) 


	str_l	x21, __fdt_pointer, x5		// Save FDT pointer



	ldr_l	x4, kimage_vaddr		// Save the offset between

	adrp	x4, _text			// Save the offset between

	sub	x4, x4, x0			// the kernel virtual and

	str_l	x4, kimage_voffset, x5		// physical mappings

arch/arm64/mm/mmu.c

+0 −3
Original line number Diff line number Diff line
@@ -52,9 +52,6 @@ u64 vabits_actual __ro_after_init = VA_BITS_MIN; 
EXPORT_SYMBOL(vabits_actual);

#endif



u64 kimage_vaddr __ro_after_init = (u64)&_text;

EXPORT_SYMBOL(kimage_vaddr);



u64 kimage_voffset __ro_after_init;

EXPORT_SYMBOL(kimage_voffset);