[S390] Kconfig: use common Kconfig files for s390. (61d48c2c) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/s390/Kconfig

+16 −33

Original line number	Original line	Diff line number	Diff line
	@@ -4,27 +4,23 @@
	#		#

	config MMU		config MMU
	bool		def_bool y
	default y

	config ZONE_DMA		config ZONE_DMA
	def_bool y		def_bool y
	depends on 64BIT		depends on 64BIT

	config LOCKDEP_SUPPORT		config LOCKDEP_SUPPORT
	bool		def_bool y
	default y

	config STACKTRACE_SUPPORT		config STACKTRACE_SUPPORT
	bool		def_bool y
	default y

	config RWSEM_GENERIC_SPINLOCK		config RWSEM_GENERIC_SPINLOCK
	bool		bool

	config RWSEM_XCHGADD_ALGORITHM		config RWSEM_XCHGADD_ALGORITHM
	bool		def_bool y
	default y

	config ARCH_HAS_ILOG2_U32		config ARCH_HAS_ILOG2_U32
	bool		bool
	@@ -35,8 +31,7 @@ config ARCH_HAS_ILOG2_U64
	default n		default n

	config GENERIC_HWEIGHT		config GENERIC_HWEIGHT
	bool		def_bool y
	default y

	config GENERIC_TIME		config GENERIC_TIME
	def_bool y		def_bool y
	@@ -55,8 +50,7 @@ config NO_DMA
	mainmenu "Linux Kernel Configuration"		mainmenu "Linux Kernel Configuration"

	config S390		config S390
	bool		def_bool y
	default y

	source "init/Kconfig"		source "init/Kconfig"

	@@ -280,6 +274,10 @@ config WARN_STACK_SIZE
	config ARCH_POPULATES_NODE_MAP		config ARCH_POPULATES_NODE_MAP
	def_bool y		def_bool y

			comment "Kernel preemption"

			source "kernel/Kconfig.preempt"

	source "mm/Kconfig"		source "mm/Kconfig"

	config HOLES_IN_ZONE		config HOLES_IN_ZONE
	@@ -320,17 +318,6 @@ config QDIO_DEBUG

	comment "Misc"		comment "Misc"

	config PREEMPT
	bool "Preemptible Kernel"
	help
	This option reduces the latency of the kernel when reacting to
	real-time or interactive events by allowing a low priority process to
	be preempted even if it is in kernel mode executing a system call.
	This allows applications to run more reliably even when the system is
	under load.

	Say N if you are unsure.

	config IPL		config IPL
	bool "Builtin IPL record support"		bool "Builtin IPL record support"
	help		help
	@@ -488,6 +475,8 @@ config APPLDATA_NET_SUM
	This can also be compiled as a module, which will be called		This can also be compiled as a module, which will be called
	appldata_net_sum.o.		appldata_net_sum.o.

			source kernel/Kconfig.hz

	config NO_IDLE_HZ		config NO_IDLE_HZ
	bool "No HZ timer ticks in idle"		bool "No HZ timer ticks in idle"
	help		help
	@@ -535,18 +524,12 @@ endmenu
	source "net/Kconfig"		source "net/Kconfig"

	config PCMCIA		config PCMCIA
	bool		def_bool n
	default n

	source "drivers/base/Kconfig"

	source "drivers/connector/Kconfig"		config CCW
			def_bool y
	source "drivers/scsi/Kconfig"

	source "drivers/s390/Kconfig"

	source "drivers/net/Kconfig"		source "drivers/Kconfig"

	source "fs/Kconfig"		source "fs/Kconfig"

drivers/block/Kconfig

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -444,8 +444,6 @@ config CDROM_PKTCDVD_WCACHE
	this option is dangerous unless the CD-RW media is known good, as we		this option is dangerous unless the CD-RW media is known good, as we
	don't do deferred write error handling yet.		don't do deferred write error handling yet.

	source "drivers/s390/block/Kconfig"

	config ATA_OVER_ETH		config ATA_OVER_ETH
	tristate "ATA over Ethernet support"		tristate "ATA over Ethernet support"
	depends on NET		depends on NET
	@@ -453,6 +451,8 @@ config ATA_OVER_ETH
	This driver provides Support for ATA over Ethernet block		This driver provides Support for ATA over Ethernet block
	devices like the Coraid EtherDrive (R) Storage Blade.		devices like the Coraid EtherDrive (R) Storage Blade.

			source "drivers/s390/block/Kconfig"

	endmenu		endmenu

	endif		endif

drivers/char/Kconfig

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1081,5 +1081,7 @@ config DEVPORT
	depends on ISA \|\| PCI		depends on ISA \|\| PCI
	default y		default y

			source "drivers/s390/char/Kconfig"

	endmenu		endmenu

drivers/crypto/Kconfig

+22 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,4 +56,26 @@ config CRYPTO_DEV_GEODE
	To compile this driver as a module, choose M here: the module		To compile this driver as a module, choose M here: the module
	will be called geode-aes.		will be called geode-aes.

			config ZCRYPT
			tristate "Support for PCI-attached cryptographic adapters"
			depends on S390
			select ZCRYPT_MONOLITHIC if ZCRYPT="y"
			default "m"
			help
			Select this option if you want to use a PCI-attached cryptographic
			adapter like:
			+ PCI Cryptographic Accelerator (PCICA)
			+ PCI Cryptographic Coprocessor (PCICC)
			+ PCI-X Cryptographic Coprocessor (PCIXCC)
			+ Crypto Express2 Coprocessor (CEX2C)
			+ Crypto Express2 Accelerator (CEX2A)

			config ZCRYPT_MONOLITHIC
			bool "Monolithic zcrypt module"
			depends on ZCRYPT="m"
			help
			Select this option if you want to have a single module z90crypt.ko
			that contains all parts of the crypto device driver (ap bus,
			request router and all the card drivers).

	endmenu		endmenu

drivers/s390/block/Kconfig

+4 −7

Original line number	Original line	Diff line number	Diff line
	if S390 && BLOCK

	comment "S/390 block device drivers"		comment "S/390 block device drivers"
	depends on S390		depends on S390 && BLOCK

	config BLK_DEV_XPRAM		config BLK_DEV_XPRAM
	tristate "XPRAM disk support"		tristate "XPRAM disk support"
	depends on S390		depends on S390 && BLOCK
	help		help
	Select this option if you want to use your expanded storage on S/390		Select this option if you want to use your expanded storage on S/390
	or zSeries as a disk. This is useful as a _fast_ swap device if you		or zSeries as a disk. This is useful as a _fast_ swap device if you
	@@ -15,12 +13,13 @@ config BLK_DEV_XPRAM

	config DCSSBLK		config DCSSBLK
	tristate "DCSSBLK support"		tristate "DCSSBLK support"
			depends on S390 && BLOCK
	help		help
	Support for dcss block device		Support for dcss block device

	config DASD		config DASD
	tristate "Support for DASD devices"		tristate "Support for DASD devices"
	depends on CCW		depends on CCW && BLOCK
	help		help
	Enable this option if you want to access DASDs directly utilizing		Enable this option if you want to access DASDs directly utilizing
	S/390s channel subsystem commands. This is necessary for running		S/390s channel subsystem commands. This is necessary for running
	@@ -62,5 +61,3 @@ config DASD_EER
	This driver provides a character device interface to the		This driver provides a character device interface to the
	DASD extended error reporting. This is only needed if you want to		DASD extended error reporting. This is only needed if you want to
	use applications written for the EER facility.		use applications written for the EER facility.

	endif