Commit 8e0b986c authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390: Remove compat support 



There shouldn't be any 31 bit code around anymore that matters.
Remove the compat layer support required to run 31 bit code.

Reason for removal is code simplification and reduced test effort.

Note that this comes without any deprecation warnings added to config
options, or kernel messages, since most likely those would be ignored
anyway.

If it turns out there is still a reason to keep the compat layer this
can be reverted at any time in the future.

Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 169ebcbb

arch/s390/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -505,22 +505,6 @@ config COMMAND_LINE_SIZE 
	  This allows you to specify the maximum length of the kernel command

	  line.



config COMPAT

	def_bool n

	prompt "Kernel support for 31 bit emulation"

	select ARCH_WANT_OLD_COMPAT_IPC

	select COMPAT_OLD_SIGACTION

	select HAVE_UID16

	depends on MULTIUSER

	depends on !CC_IS_CLANG && !LD_IS_LLD

	help

	  Select this option if you want to enable your system kernel to

	  handle system-calls from ELF binaries for 31 bit ESA.  This option

	  (and some other stuff like libraries and such) is needed for

	  executing 31 bit applications.



	  If unsure say N.



config SMP

	def_bool y

arch/s390/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -149,11 +149,8 @@ ifeq ($(KBUILD_EXTMOD),) 
prepare: vdso_prepare

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)



vdso-install-y			+= arch/s390/kernel/vdso64/vdso64.so.dbg

vdso-install-$(CONFIG_COMPAT)	+= arch/s390/kernel/vdso32/vdso32.so.dbg



endif

arch/s390/boot/ipl_data.c

+0 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <linux/compat.h>

#include <linux/ptrace.h>

#include <asm/cio.h>

#include <asm/asm-offsets.h>

arch/s390/configs/compat.config

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# Help: Enable compat support

CONFIG_COMPAT=y

CONFIG_COMPAT_32BIT_TIME=y

arch/s390/hypfs/hypfs_sprp.c

+1 −5
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
 *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>

 */



#include <linux/compat.h>

#include <linux/errno.h>

#include <linux/gfp.h>

#include <linux/string.h>
@@ -116,9 +115,6 @@ static long hypfs_sprp_ioctl(struct file *file, unsigned int cmd, 


	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;

	if (is_compat_task())

		argp = compat_ptr(arg);

	else

	argp = (void __user *)arg;

	switch (cmd) {

	case HYPFS_DIAG304: