Commit c658cabb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ab6efe68 2f23256c

arch/s390/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ endif 


ifdef CONFIG_EXPOLINE

  ifdef CONFIG_EXPOLINE_EXTERN

    KBUILD_LDFLAGS_MODULE += arch/s390/lib/expoline.o

    KBUILD_LDFLAGS_MODULE += arch/s390/lib/expoline/expoline.o

    CC_FLAGS_EXPOLINE := -mindirect-branch=thunk-extern

    CC_FLAGS_EXPOLINE += -mfunction-return=thunk-extern

  else
@@ -163,6 +163,12 @@ vdso_prepare: prepare0 
	$(Q)$(MAKE) $(build)=arch/s390/kernel/vdso64 include/generated/vdso64-offsets.h

	$(if $(CONFIG_COMPAT),$(Q)$(MAKE) \

		$(build)=arch/s390/kernel/vdso32 include/generated/vdso32-offsets.h)



ifdef CONFIG_EXPOLINE_EXTERN

modules_prepare: expoline_prepare

expoline_prepare:

	$(Q)$(MAKE) $(build)=arch/s390/lib/expoline arch/s390/lib/expoline/expoline.o

endif

endif



# Don't use tabs in echo arguments

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

+0 −2
Original line number Diff line number Diff line
@@ -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__

arch/s390/lib/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ lib-y += delay.o string.o uaccess.o find.o spinlock.o 
obj-y += mem.o xor.o

lib-$(CONFIG_KPROBES) += probes.o

lib-$(CONFIG_UPROBES) += probes.o

obj-$(CONFIG_EXPOLINE_EXTERN) += expoline.o

obj-$(CONFIG_S390_KPROBES_SANITY_TEST) += test_kprobes_s390.o

test_kprobes_s390-objs += test_kprobes_asm.o test_kprobes.o
@@ -22,3 +21,5 @@ obj-$(CONFIG_S390_MODULES_SANITY_TEST) += test_modules.o 
obj-$(CONFIG_S390_MODULES_SANITY_TEST_HELPERS) += test_modules_helpers.o



lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o



obj-$(CONFIG_EXPOLINE_EXTERN) += expoline/

arch/s390/lib/expoline/Makefile

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



obj-y += expoline.o