Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 347a8dc3 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Linus Torvalds
Browse files

[PATCH] s390: cleanup Kconfig 



Sanitize some s390 Kconfig options.  We have ARCH_S390, ARCH_S390X,
ARCH_S390_31, 64BIT, S390_SUPPORT and COMPAT.  Replace these 6 options by
S390, 64BIT and COMPAT.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9bbc8346

arch/s390/Kconfig

+7 −20
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ config GENERIC_BUST_SPINLOCK 


mainmenu "Linux Kernel Configuration"



config ARCH_S390

config S390

	bool

	default y



config UID16

	bool

	default y

	depends on ARCH_S390X = 'n'

	depends on !64BIT



source "init/Kconfig"
@@ -38,20 +38,12 @@ menu "Base setup" 


comment "Processor type and features"



config ARCH_S390X

config 64BIT

	bool "64 bit kernel"

	help

	  Select this option if you have a 64 bit IBM zSeries machine

	  and want to use the 64 bit addressing mode.



config 64BIT

	def_bool ARCH_S390X



config ARCH_S390_31

	bool

	depends on ARCH_S390X = 'n'

	default y



config SMP

	bool "Symmetric multi-processing support"

	---help---
@@ -101,20 +93,15 @@ config MATHEMU 
	  on older S/390 machines. Say Y unless you know your machine doesn't

	  need this.



config S390_SUPPORT

config COMPAT

	bool "Kernel support for 31 bit emulation"

	depends on ARCH_S390X

	depends on 64BIT

	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.  It is safe to say "Y".



config COMPAT

	bool

	depends on S390_SUPPORT

	default y



config SYSVIPC_COMPAT

	bool

	depends on COMPAT && SYSVIPC
@@ -122,7 +109,7 @@ config SYSVIPC_COMPAT 


config BINFMT_ELF32

	tristate "Kernel support for 31 bit ELF binaries"

	depends on S390_SUPPORT

	depends on COMPAT

	help

	  This allows you to run 32-bit Linux/ELF binaries on your zSeries

	  in 64 bit mode. Everybody wants this; say Y.
@@ -135,7 +122,7 @@ choice 


config MARCH_G5

	bool "S/390 model G5 and G6"

	depends on ARCH_S390_31

	depends on !64BIT

	help

	  Select this to build a 31 bit kernel that works

	  on all S/390 and zSeries machines.

arch/s390/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -13,16 +13,14 @@ 
# Copyright (C) 1994 by Linus Torvalds

#



ifdef CONFIG_ARCH_S390_31

ifndef CONFIG_64BIT

LDFLAGS		:= -m elf_s390

CFLAGS		+= -m31

AFLAGS		+= -m31

UTS_MACHINE	:= s390

STACK_SIZE	:= 8192

CHECKFLAGS	+= -D__s390__

endif



ifdef CONFIG_ARCH_S390X

else

LDFLAGS		:= -m elf64_s390

MODFLAGS	+= -fpic -D__PIC__

CFLAGS		+= -m64

arch/s390/appldata/appldata_base.c

+4 −4
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


#define TOD_MICRO	0x01000			/* nr. of TOD clock units

						   for 1 microsecond */

#ifndef CONFIG_ARCH_S390X

#ifndef CONFIG_64BIT



#define APPLDATA_START_INTERVAL_REC 0x00   	/* Function codes for */

#define APPLDATA_STOP_REC	    0x01	/* DIAG 0xDC	  */
@@ -54,13 +54,13 @@ 
#define APPLDATA_GEN_EVENT_RECORD   0x82

#define APPLDATA_START_CONFIG_REC   0x83



#endif /* CONFIG_ARCH_S390X */

#endif /* CONFIG_64BIT */





/*

 * Parameter list for DIAGNOSE X'DC'

 */

#ifndef CONFIG_ARCH_S390X

#ifndef CONFIG_64BIT

struct appldata_parameter_list {

	u16 diag;		/* The DIAGNOSE code X'00DC'          */

	u8  function;		/* The function code for the DIAGNOSE */
@@ -82,7 +82,7 @@ struct appldata_parameter_list { 
	u64 product_id_addr;

	u64 buffer_addr;

};

#endif /* CONFIG_ARCH_S390X */

#endif /* CONFIG_64BIT */



/*

 * /proc entries (sysctl)

arch/s390/crypto/crypt_s390.h

+5 −5
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ struct crypt_s390_query_status { 
 * [ret] is the variable to receive the error code

 * [ERR] is the error code value

 */

#ifndef __s390x__

#ifndef CONFIG_64BIT

#define __crypt_s390_fixup \

	".section .fixup,\"ax\" \n"	\

	"7:	lhi	%0,%h[e1] \n"	\
@@ -129,7 +129,7 @@ struct crypt_s390_query_status { 
	"	.long	0b,7b \n"	\

	"	.long	1b,8b \n"	\

	".previous"

#else /* __s390x__ */

#else /* CONFIG_64BIT */

#define __crypt_s390_fixup \

	".section .fixup,\"ax\" \n"	\

	"7:	lhi	%0,%h[e1] \n"	\
@@ -142,7 +142,7 @@ struct crypt_s390_query_status { 
	"	.quad	0b,7b \n"	\

	"	.quad	1b,8b \n"	\

	".previous"

#endif /* __s390x__ */

#endif /* CONFIG_64BIT */



/*

 * Standard code for setting the result of s390 crypto instructions.
@@ -150,10 +150,10 @@ struct crypt_s390_query_status { 
 * [result]: the register containing the result (e.g. second operand length

 * to compute number of processed bytes].

 */

#ifndef __s390x__

#ifndef CONFIG_64BIT

#define __crypt_s390_set_result \

	"	lr	%0,%[result] \n"

#else /* __s390x__ */

#else /* CONFIG_64BIT */

#define __crypt_s390_set_result \

	"	lgr	%0,%[result] \n"

#endif

arch/s390/defconfig

+1 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
CONFIG_MMU=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ARCH_S390=y

CONFIG_S390=y

CONFIG_UID16=y



#
@@ -89,9 +89,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
#

# Processor type and features

#

# CONFIG_ARCH_S390X is not set

# CONFIG_64BIT is not set

CONFIG_ARCH_S390_31=y

CONFIG_SMP=y

CONFIG_NR_CPUS=32

CONFIG_HOTPLUG_CPU=y