Commit 120dc60d authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

arm64: get rid of TEXT_OFFSET 



TEXT_OFFSET serves no purpose, and for this reason, it was redefined
as 0x0 in the v5.8 timeframe. Since this does not appear to have caused
any issues that require us to revisit that decision, let's get rid of the
macro entirely, along with any references to it.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20200825135440.11288-1-ardb@kernel.org


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

arch/arm64/Makefile

+0 −6
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
# Copyright (C) 1995-2001 by Russell King



LDFLAGS_vmlinux	:=--no-undefined -X

CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)



ifeq ($(CONFIG_RELOCATABLE), y)

# Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour
@@ -132,9 +131,6 @@ endif 
# Default value

head-y		:= arch/arm64/kernel/head.o



# The byte offset of the kernel image in RAM from the start of RAM.

TEXT_OFFSET := 0x0



ifeq ($(CONFIG_KASAN_SW_TAGS), y)

KASAN_SHADOW_SCALE_SHIFT := 4

else
@@ -145,8 +141,6 @@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) 
KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT)

KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT)



export	TEXT_OFFSET



core-y		+= arch/arm64/

libs-y		:= arch/arm64/lib/ $(libs-y)

libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a

arch/arm64/include/asm/boot.h

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ 
#define MAX_FDT_SIZE		SZ_2M



/*

 * arm64 requires the kernel image to placed

 * TEXT_OFFSET bytes beyond a 2 MB aligned base

 * arm64 requires the kernel image to placed at a 2 MB aligned base address

 */

#define MIN_KIMG_ALIGN		SZ_2M

arch/arm64/include/asm/kernel-pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
			+ EARLY_PGDS((vstart), (vend)) 	/* each PGDIR needs a next level page table */	\

			+ EARLY_PUDS((vstart), (vend))	/* each PUD needs a next level page table */	\

			+ EARLY_PMDS((vstart), (vend)))	/* each PMD needs a next level page table */

#define INIT_DIR_SIZE (PAGE_SIZE * EARLY_PAGES(KIMAGE_VADDR + TEXT_OFFSET, _end))

#define INIT_DIR_SIZE (PAGE_SIZE * EARLY_PAGES(KIMAGE_VADDR, _end))

#define IDMAP_DIR_SIZE		(IDMAP_PGTABLE_LEVELS * PAGE_SIZE)



#ifdef CONFIG_ARM64_SW_TTBR0_PAN

arch/arm64/include/asm/memory.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ 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 (minus TEXT_OFFSET) */

/* the virtual base of the kernel image */

extern u64			kimage_vaddr;



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

arch/arm64/kernel/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
# Makefile for the linux kernel.

#



CPPFLAGS_vmlinux.lds	:= -DTEXT_OFFSET=$(TEXT_OFFSET)

AFLAGS_head.o		:= -DTEXT_OFFSET=$(TEXT_OFFSET)

CFLAGS_armv8_deprecated.o := -I$(src)



CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE)

CRA Git | Maintained and supported by SUSTech CRA and CCSE