diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2022-06-27 14:50:56 +0200 |
|---|---|---|
| committer | Alexander Gordeev <agordeev@linux.ibm.com> | 2022-07-13 15:21:55 +0200 |
| commit | a0b0987a781157263b82f4022649cf686d36c787 (patch) | |
| tree | ebde6562f3c926d9cdab9bbbf9944379c6b4bcc1 | |
| parent | c4e789572557aa147b13bf7fe09cc99663ed0cf5 (diff) | |
| download | linux-stable-a0b0987a781157263b82f4022649cf686d36c787.tar.gz linux-stable-a0b0987a781157263b82f4022649cf686d36c787.tar.bz2 linux-stable-a0b0987a781157263b82f4022649cf686d36c787.zip | |
s390/nospec: remove unneeded header includes
Commit 4efd417f298b ("s390: raise minimum supported machine generation
to z10") removed the usage of alternatives and lowcore in expolines
macros. Remove unneeded header includes as well.
With that, expoline.S doesn't require asm-offsets.h and
expoline_prepare target dependency could be removed.
Tested-by: Joe Lawrence <joe.lawrence@redhat.com>
Link: https://lore.kernel.org/r/patch-2.thread-d13b6c.git-d13b6c96fb5f.your-ad-here.call-01656331067-ext-4899@work.hours
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
| -rw-r--r-- | arch/s390/Makefile | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/nospec-insn.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/Makefile b/arch/s390/Makefile index fc72a35a1f07..4cb5d17e7ead 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile @@ -166,7 +166,7 @@ vdso_prepare: prepare0 ifdef CONFIG_EXPOLINE_EXTERN modules_prepare: expoline_prepare -expoline_prepare: prepare0 +expoline_prepare: $(Q)$(MAKE) $(build)=arch/s390/lib/expoline arch/s390/lib/expoline/expoline.o endif endif diff --git a/arch/s390/include/asm/nospec-insn.h b/arch/s390/include/asm/nospec-insn.h index d910d71b5bb5..7e9e99523e95 100644 --- a/arch/s390/include/asm/nospec-insn.h +++ b/arch/s390/include/asm/nospec-insn.h @@ -2,8 +2,6 @@ #ifndef _ASM_S390_NOSPEC_ASM_H #define _ASM_S390_NOSPEC_ASM_H -#include <asm/alternative-asm.h> -#include <asm/asm-offsets.h> #include <asm/dwarf.h> #ifdef __ASSEMBLY__ |