|
Jiri Slaby |
a0e8ac |
From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
|
|
Jiri Slaby |
a0e8ac |
Date: Thu, 16 Mar 2023 12:05:08 +0100
|
|
Jiri Slaby |
a0e8ac |
Subject: s390: reintroduce expoline dependence to scripts
|
|
Jiri Slaby |
a0e8ac |
Patch-mainline: submitted <20230316112809.7903-1-jirislaby@kernel.org>
|
|
Jiri Slaby |
a0e8ac |
References: s390 expolines & fixdep
|
|
Jiri Slaby |
a0e8ac |
|
|
Jiri Slaby |
a0e8ac |
Expolines depend on scripts/basic/fixdep. And build of expolines can now
|
|
Jiri Slaby |
a0e8ac |
race with the fixdep build:
|
|
Jiri Slaby |
a0e8ac |
|
|
Jiri Slaby |
a0e8ac |
make[1]: *** Deleting file 'arch/s390/lib/expoline/expoline.o'
|
|
Jiri Slaby |
a0e8ac |
/bin/sh: line 1: scripts/basic/fixdep: Permission denied
|
|
Jiri Slaby |
a0e8ac |
make[1]: *** [../scripts/Makefile.build:385: arch/s390/lib/expoline/expoline.o] Error 126
|
|
Jiri Slaby |
a0e8ac |
make: *** [../arch/s390/Makefile:166: expoline_prepare] Error 2
|
|
Jiri Slaby |
a0e8ac |
|
|
Jiri Slaby |
a0e8ac |
The dependence was removed in the below Fixes: commit. So reintroduce
|
|
Jiri Slaby |
a0e8ac |
the dependence on scripts.
|
|
Jiri Slaby |
a0e8ac |
|
|
Jiri Slaby |
a0e8ac |
Fixes: a0b0987a7811 ("s390/nospec: remove unneeded header includes")
|
|
Jiri Slaby |
a0e8ac |
Cc: Joe Lawrence <joe.lawrence@redhat.com>
|
|
Jiri Slaby |
a0e8ac |
Cc: stable@vger.kernel.org
|
|
Jiri Slaby |
a0e8ac |
Cc: Heiko Carstens <hca@linux.ibm.com>
|
|
Jiri Slaby |
a0e8ac |
Cc: Vasily Gorbik <gor@linux.ibm.com>
|
|
Jiri Slaby |
a0e8ac |
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
|
|
Jiri Slaby |
a0e8ac |
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
|
|
Jiri Slaby |
a0e8ac |
Cc: Sven Schnelle <svens@linux.ibm.com>
|
|
Jiri Slaby |
a0e8ac |
Cc: linux-s390@vger.kernel.org
|
|
Jiri Slaby |
a0e8ac |
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
|
|
Jiri Slaby |
a0e8ac |
---
|
|
Jiri Slaby |
a0e8ac |
arch/s390/Makefile | 2 +-
|
|
Jiri Slaby |
a0e8ac |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Jiri Slaby |
a0e8ac |
|
|
Jiri Slaby |
a0e8ac |
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
|
|
Jiri Slaby |
a0e8ac |
index b3235ab0ace8..ed646c583e4f 100644
|
|
Jiri Slaby |
a0e8ac |
--- a/arch/s390/Makefile
|
|
Jiri Slaby |
a0e8ac |
+++ b/arch/s390/Makefile
|
|
Jiri Slaby |
a0e8ac |
@@ -162,7 +162,7 @@ vdso_prepare: prepare0
|
|
Jiri Slaby |
a0e8ac |
|
|
Jiri Slaby |
a0e8ac |
ifdef CONFIG_EXPOLINE_EXTERN
|
|
Jiri Slaby |
a0e8ac |
modules_prepare: expoline_prepare
|
|
Jiri Slaby |
a0e8ac |
-expoline_prepare:
|
|
Jiri Slaby |
a0e8ac |
+expoline_prepare: scripts
|
|
Jiri Slaby |
a0e8ac |
$(Q)$(MAKE) $(build)=arch/s390/lib/expoline arch/s390/lib/expoline/expoline.o
|
|
Jiri Slaby |
a0e8ac |
endif
|
|
Jiri Slaby |
a0e8ac |
endif
|
|
Jiri Slaby |
a0e8ac |
--
|
|
Jiri Slaby |
a0e8ac |
2.40.0
|
|
Jiri Slaby |
a0e8ac |
|