Commit 130951bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Heiko Carstens:

 - fix zstd build for -march=z900 (undefined reference to __clzdi2)

 - add missing .got.plts to vdso linker scripts to fix kpatch build
   errors

 - update defconfigs

* tag 's390-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: update defconfigs
  s390/boot: fix zstd build for -march=z900
  s390/vdso: add .got.plt in vdso linker script
parents 97fcc07b ecd92e21

arch/s390/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ UBSAN_SANITIZE := n 
KASAN_SANITIZE := n



obj-y	:= $(if $(CONFIG_KERNEL_UNCOMPRESSED),,decompressor.o) info.o

obj-$(CONFIG_KERNEL_ZSTD) += clz_ctz.o

obj-all := $(obj-y) piggy.o syms.o

targets	:= vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2

targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4

arch/s390/boot/compressed/clz_ctz.c

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

#include "../../../../lib/clz_ctz.c"

arch/s390/configs/debug_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ CONFIG_L2TP_DEBUGFS=m 
CONFIG_L2TP_V3=y

CONFIG_L2TP_IP=m

CONFIG_L2TP_ETH=m

CONFIG_BRIDGE=m

CONFIG_BRIDGE=y

CONFIG_BRIDGE_MRP=y

CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q_GVRP=y

arch/s390/configs/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ CONFIG_L2TP_DEBUGFS=m 
CONFIG_L2TP_V3=y

CONFIG_L2TP_IP=m

CONFIG_L2TP_ETH=m

CONFIG_BRIDGE=m

CONFIG_BRIDGE=y

CONFIG_BRIDGE_MRP=y

CONFIG_VLAN_8021Q=m

CONFIG_VLAN_8021Q_GVRP=y

arch/s390/kernel/vdso32/vdso32.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ SECTIONS 


	.rela.dyn ALIGN(8) : { *(.rela.dyn) }

	.got ALIGN(8)	: { *(.got .toc) }

	.got.plt ALIGN(8) : { *(.got.plt) }



	_end = .;

	PROVIDE(end = .);