Commit 5f1f7f6c authored by Will Deacon's avatar Will Deacon
Browse files

arm64: Reduce the number of header files pulled into vmlinux.lds.S 



Although vmlinux.lds.S smells like an assembly file and is compiled
with __ASSEMBLY__ defined, it's actually just fed to the preprocessor to
create our linker script. This means that any assembly macros defined
by headers that it includes will result in a helpful link error:

| aarch64-linux-gnu-ld:./arch/arm64/kernel/vmlinux.lds:1: syntax error

In preparation for an arm64-private asm/rwonce.h implementation, which
will end up pulling assembly macros into linux/compiler.h, reduce the
number of headers we include directly and transitively in vmlinux.lds.S

Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent eb5c2d4b

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

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#ifndef __ASM_KERNEL_PGTABLE_H

#define __ASM_KERNEL_PGTABLE_H



#include <linux/pgtable.h>

#include <asm/pgtable-hwdef.h>

#include <asm/sparsemem.h>



/*

arch/arm64/include/asm/memory.h

+6 −5
Original line number Diff line number Diff line
@@ -10,11 +10,8 @@ 
#ifndef __ASM_MEMORY_H

#define __ASM_MEMORY_H



#include <linux/compiler.h>

#include <linux/const.h>

#include <linux/sizes.h>

#include <linux/types.h>

#include <asm/bug.h>

#include <asm/page-def.h>



/*
@@ -157,11 +154,15 @@ 
#endif



#ifndef __ASSEMBLY__

extern u64			vabits_actual;

#define PAGE_END		(_PAGE_END(vabits_actual))



#include <linux/bitops.h>

#include <linux/compiler.h>

#include <linux/mmdebug.h>

#include <linux/types.h>

#include <asm/bug.h>



extern u64			vabits_actual;

#define PAGE_END		(_PAGE_END(vabits_actual))



extern s64			physvirt_offset;

extern s64			memstart_addr;

arch/arm64/include/asm/uaccess.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/string.h>



#include <asm/cpufeature.h>

#include <asm/mmu.h>

#include <asm/ptrace.h>

#include <asm/memory.h>

#include <asm/extable.h>

arch/arm64/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <asm/assembler.h>

#include <asm/asm-offsets.h>

#include <asm/asm_pointer_auth.h>

#include <asm/bug.h>

#include <asm/cpufeature.h>

#include <asm/errno.h>

#include <asm/esr.h>

arch/arm64/kernel/vmlinux.lds.S

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <asm-generic/vmlinux.lds.h>

#include <asm/cache.h>

#include <asm/kernel-pgtable.h>

#include <asm/thread_info.h>

#include <asm/memory.h>

#include <asm/page.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE