Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Vasily Gorbik and committed by
Alexander Gordeev
a0b0987a c4e78957

+1 -3
+1 -1
arch/s390/Makefile
··· 166 166 167 167 ifdef CONFIG_EXPOLINE_EXTERN 168 168 modules_prepare: expoline_prepare 169 - expoline_prepare: prepare0 169 + expoline_prepare: 170 170 $(Q)$(MAKE) $(build)=arch/s390/lib/expoline arch/s390/lib/expoline/expoline.o 171 171 endif 172 172 endif
-2
arch/s390/include/asm/nospec-insn.h
··· 2 2 #ifndef _ASM_S390_NOSPEC_ASM_H 3 3 #define _ASM_S390_NOSPEC_ASM_H 4 4 5 - #include <asm/alternative-asm.h> 6 - #include <asm/asm-offsets.h> 7 5 #include <asm/dwarf.h> 8 6 9 7 #ifdef __ASSEMBLY__