Skip to content

Commit a0b0987

Browse files
Vasily GorbikAlexander Gordeev
authored andcommitted
s390/nospec: remove unneeded header includes
Commit 4efd417 ("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>
1 parent c4e7895 commit a0b0987

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

arch/s390/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ vdso_prepare: prepare0
166166

167167
ifdef CONFIG_EXPOLINE_EXTERN
168168
modules_prepare: expoline_prepare
169-
expoline_prepare: prepare0
169+
expoline_prepare:
170170
$(Q)$(MAKE) $(build)=arch/s390/lib/expoline arch/s390/lib/expoline/expoline.o
171171
endif
172172
endif

arch/s390/include/asm/nospec-insn.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#ifndef _ASM_S390_NOSPEC_ASM_H
33
#define _ASM_S390_NOSPEC_ASM_H
44

5-
#include <asm/alternative-asm.h>
6-
#include <asm/asm-offsets.h>
75
#include <asm/dwarf.h>
86

97
#ifdef __ASSEMBLY__

0 commit comments

Comments
 (0)