Several x86 files use ELF-related declarations and currently rely on them being provided indirectly through linux/module.h -> linux/elf.h:
* arch/x86/entry/entry_fred.c: ia32_enabled() -> asm/ia32.h, * arch/x86/entry/syscall_32.c: vdso32_image -> asm/vdso.h, * arch/x86/kernel/cpu/intel.c: ELF_HWCAP2 -> asm/elf.h, * arch/x86/kernel/fpu/xstate.c: elf_coredump_extra_notes_write(), elf_coredump_extra_notes_size(), NT_X86_XSAVE_LAYOUT, elf_note -> linux/elf.h, * arch/x86/kernel/process.c: mmap_is_ia32() -> asm/elf.h, * arch/x86/kernel/signal.c: get_sigframe_size() -> asm/elf.h. Add the missing includes to these files in preparation for removing the linux/elf.h include from linux/module.h. Signed-off-by: Petr Pavlu <[email protected]> --- arch/x86/entry/entry_fred.c | 1 + arch/x86/entry/syscall_32.c | 1 + arch/x86/kernel/cpu/intel.c | 1 + arch/x86/kernel/fpu/xstate.c | 2 +- arch/x86/kernel/process.c | 1 + arch/x86/kernel/signal.c | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/entry/entry_fred.c b/arch/x86/entry/entry_fred.c index fb3594ddf731..ea3bb4298065 100644 --- a/arch/x86/entry/entry_fred.c +++ b/arch/x86/entry/entry_fred.c @@ -9,6 +9,7 @@ #include <asm/desc.h> #include <asm/fred.h> +#include <asm/ia32.h> #include <asm/idtentry.h> #include <asm/syscall.h> #include <asm/trapnr.h> diff --git a/arch/x86/entry/syscall_32.c b/arch/x86/entry/syscall_32.c index 31b9492fe851..12fceffc99ef 100644 --- a/arch/x86/entry/syscall_32.c +++ b/arch/x86/entry/syscall_32.c @@ -12,6 +12,7 @@ #include <asm/traps.h> #include <asm/cpufeature.h> #include <asm/syscall.h> +#include <asm/vdso.h> #ifdef CONFIG_IA32_EMULATION #define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, compat) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index abb3984336eb..18cf40f08557 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -17,6 +17,7 @@ #include <asm/cpufeature.h> #include <asm/cpu.h> #include <asm/cpuid/api.h> +#include <asm/elf.h> #include <asm/hwcap2.h> #include <asm/intel-family.h> #include <asm/microcode.h> diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index a7b6524a9dea..8b90bf86a742 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -7,6 +7,7 @@ #include <linux/bitops.h> #include <linux/compat.h> #include <linux/cpu.h> +#include <linux/elf.h> #include <linux/mman.h> #include <linux/kvm_types.h> #include <linux/nospec.h> @@ -26,7 +27,6 @@ #include <asm/msr.h> #include <asm/tlbflush.h> #include <asm/prctl.h> -#include <asm/elf.h> #include <uapi/asm/elf.h> diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 85435044e33c..e40f7f3d3489 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -54,6 +54,7 @@ #include <asm/mmu_context.h> #include <asm/msr.h> #include <asm/shstk.h> +#include <asm/elf.h> #include "process.h" diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index 2404233336ab..0fe2d7a6b1af 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -29,6 +29,7 @@ #include <linux/syscalls.h> #include <linux/rseq.h> +#include <asm/elf.h> #include <asm/processor.h> #include <asm/ucontext.h> #include <asm/fpu/signal.h> -- 2.54.0
