s390: remove unneeded #include <asm/export.h>
Subsystems (2)
PATCH 1/3 s390: remove unneeded #include <asm/export.h>
There is no EXPORT_SYMBOL line there, hence #include <asm/export.h> is unneeded.
---
arch/s390/kernel/mcount.S | 2 -- 1 file changed, 2 deletions(-)
arch/s390/kernel/mcount.S +0 -2
@@ -9,8 +9,6 @@ #include <asm/ftrace.h> #include <asm/nospec-insn.h> #include <asm/ptrace.h> -#include <asm/export.h> - #define STACK_FRAME_SIZE_PTREGS (STACK_FRAME_OVERHEAD + __PT_SIZE) #define STACK_PTREGS (STACK_FRAME_OVERHEAD)
Signature · 1 line
2.39.2
PATCH 2/3 s390: replace #include <asm/export.h> with #include <linux/export.h>
Commit ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost") deprecated <asm/export.h>, which is now a wrapper of <linux/export.h>.
Replace #include <asm/export.h> with #include <linux/export.h>.
After all the <asm/export.h> lines are converted, <asm/export.h> and <asm-generic/export.h> will be removed.
---
arch/s390/kernel/entry.S | 2 +- arch/s390/lib/mem.S | 2 +- arch/s390/lib/tishift.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/s390/kernel/entry.S +1 -1
@@ -8,6 +8,7 @@ * Denis Joseph Barrow ([email protected],[email protected]), */ +#include <linux/export.h> #include <linux/init.h> #include <linux/linkage.h> #include <asm/asm-extable.h>
@@ -26,7 +27,6 @@ #include <asm/vx-insn.h> #include <asm/setup.h> #include <asm/nmi.h> -#include <asm/export.h> #include <asm/nospec-insn.h> _LPP_OFFSET = __LC_LPP
arch/s390/lib/mem.S +1 -1
@@ -5,8 +5,8 @@ * Copyright IBM Corp. 2012 */ +#include <linux/export.h> #include <linux/linkage.h> -#include <asm/export.h> #include <asm/nospec-insn.h> GEN_BR_THUNK %r14
arch/s390/lib/tishift.S +1 -1
@@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include <linux/export.h> #include <linux/linkage.h> #include <asm/nospec-insn.h> -#include <asm/export.h> .section .noinstr.text, "ax"
Signature · 1 line
2.39.2
PATCH 3/3 s390: remove <asm/export.h>
In reply to Masahiro YamadaAll *.S files under arch/s390/ have been converted to include <linux/export.h> instead of <asm/export.h>.
Remove <asm/export.h>.
---
arch/s390/include/asm/Kbuild | 1 - 1 file changed, 1 deletion(-)
arch/s390/include/asm/Kbuild +0 -1
@@ -5,6 +5,5 @@ generated-y += syscall_table.h generated-y += unistd_nr.h generic-y += asm-offsets.h -generic-y += export.h generic-y += kvm_types.h generic-y += mcs_spinlock.h
Signature · 1 line
2.39.2
Heiko Carstens
maintainerQuoted 8 lines · Masahiro Yamada
There is no
EXPORT_SYMBOLline there, hence #include <asm/export.h> is unneeded.Signed-off-by Masahiro Yamada <[email protected]>---
arch/s390/kernel/mcount.S | 2 -- 1 file changed, 2 deletions(-)
All three patches applied. Thanks!