Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 's390-5.19-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Alexander Gordeev:
- Fix building of out-of-tree kernel modules without a pre-built kernel
in case CONFIG_EXPOLINE_EXTERN=y.
- Fix a reference counting error that could prevent unloading of zcrypt
modules.
* tag 's390-5.19-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/ap: fix error handling in __verify_queue_reservations()
s390/nospec: remove unneeded header includes
s390/nospec: build expoline.o for modules_prepare target
+13
-5
+7
-1
arch/s390/Makefile
+7
-1
arch/s390/Makefile
···
82
82
83
83
ifdef CONFIG_EXPOLINE
84
84
ifdef CONFIG_EXPOLINE_EXTERN
85
-
KBUILD_LDFLAGS_MODULE += arch/s390/lib/expoline.o
85
+
KBUILD_LDFLAGS_MODULE += arch/s390/lib/expoline/expoline.o
86
86
CC_FLAGS_EXPOLINE := -mindirect-branch=thunk-extern
87
87
CC_FLAGS_EXPOLINE += -mfunction-return=thunk-extern
88
88
else
···
163
163
$(Q)$(MAKE) $(build)=arch/s390/kernel/vdso64 include/generated/vdso64-offsets.h
164
164
$(if $(CONFIG_COMPAT),$(Q)$(MAKE) \
165
165
$(build)=arch/s390/kernel/vdso32 include/generated/vdso32-offsets.h)
166
+
167
+
ifdef CONFIG_EXPOLINE_EXTERN
168
+
modules_prepare: expoline_prepare
169
+
expoline_prepare:
170
+
$(Q)$(MAKE) $(build)=arch/s390/lib/expoline arch/s390/lib/expoline/expoline.o
171
+
endif
166
172
endif
167
173
168
174
# Don't use tabs in echo arguments
-2
arch/s390/include/asm/nospec-insn.h
-2
arch/s390/include/asm/nospec-insn.h
+2
-1
arch/s390/lib/Makefile
+2
-1
arch/s390/lib/Makefile
···
7
7
obj-y += mem.o xor.o
8
8
lib-$(CONFIG_KPROBES) += probes.o
9
9
lib-$(CONFIG_UPROBES) += probes.o
10
-
obj-$(CONFIG_EXPOLINE_EXTERN) += expoline.o
11
10
obj-$(CONFIG_S390_KPROBES_SANITY_TEST) += test_kprobes_s390.o
12
11
test_kprobes_s390-objs += test_kprobes_asm.o test_kprobes.o
13
12
···
21
22
obj-$(CONFIG_S390_MODULES_SANITY_TEST_HELPERS) += test_modules_helpers.o
22
23
23
24
lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o
25
+
26
+
obj-$(CONFIG_EXPOLINE_EXTERN) += expoline/
arch/s390/lib/expoline.S
arch/s390/lib/expoline/expoline.S
arch/s390/lib/expoline.S
arch/s390/lib/expoline/expoline.S
+3
arch/s390/lib/expoline/Makefile
+3
arch/s390/lib/expoline/Makefile