Commit 1ecf7bd9 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390: update defconfigs 



Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 42400d99

arch/s390/configs/debug_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ CONFIG_NFT_CT=m 
CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_OBJREF=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m
@@ -569,6 +568,7 @@ CONFIG_INPUT_EVDEV=y 
# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_LEGACY_PTY_COUNT=0

# CONFIG_LEGACY_TIOCSTI is not set

CONFIG_VIRTIO_CONSOLE=m

CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_HANGCHECK_TIMER=m
@@ -660,6 +660,7 @@ CONFIG_CONFIGFS_FS=m 
CONFIG_ECRYPT_FS=m

CONFIG_CRAMFS=m

CONFIG_SQUASHFS=m

CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT=y

CONFIG_SQUASHFS_XATTR=y

CONFIG_SQUASHFS_LZ4=y

CONFIG_SQUASHFS_LZO=y
@@ -705,6 +706,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y 
CONFIG_SECURITY_LANDLOCK=y

CONFIG_INTEGRITY_SIGNATURE=y

CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y

CONFIG_INTEGRITY_PLATFORM_KEYRING=y

CONFIG_IMA=y

CONFIG_IMA_DEFAULT_HASH_SHA256=y

CONFIG_IMA_WRITE_POLICY=y
@@ -781,6 +783,7 @@ CONFIG_ZCRYPT=m 
CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_SYSTEM_BLACKLIST_KEYRING=y

CONFIG_CORDIC=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
@@ -848,7 +851,6 @@ CONFIG_PREEMPT_TRACER=y 
CONFIG_SCHED_TRACER=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_BPF_KPROBE_OVERRIDE=y

CONFIG_HIST_TRIGGERS=y

CONFIG_FTRACE_STARTUP_TEST=y

# CONFIG_EVENT_TRACE_STARTUP_TEST is not set
@@ -870,7 +872,6 @@ CONFIG_FAIL_MAKE_REQUEST=y 
CONFIG_FAIL_IO_TIMEOUT=y

CONFIG_FAIL_FUTEX=y

CONFIG_FAULT_INJECTION_DEBUG_FS=y

CONFIG_FAIL_FUNCTION=y

CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_LKDTM=m

CONFIG_TEST_MIN_HEAP=y

arch/s390/configs/defconfig

+4 −2
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ CONFIG_NFT_CT=m 
CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_OBJREF=m

CONFIG_NFT_REJECT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m
@@ -559,6 +558,7 @@ CONFIG_INPUT_EVDEV=y 
# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_LEGACY_PTY_COUNT=0

# CONFIG_LEGACY_TIOCSTI is not set

CONFIG_VIRTIO_CONSOLE=m

CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_HANGCHECK_TIMER=m
@@ -645,6 +645,7 @@ CONFIG_CONFIGFS_FS=m 
CONFIG_ECRYPT_FS=m

CONFIG_CRAMFS=m

CONFIG_SQUASHFS=m

CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT=y

CONFIG_SQUASHFS_XATTR=y

CONFIG_SQUASHFS_LZ4=y

CONFIG_SQUASHFS_LZO=y
@@ -688,6 +689,7 @@ CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y 
CONFIG_SECURITY_LANDLOCK=y

CONFIG_INTEGRITY_SIGNATURE=y

CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y

CONFIG_INTEGRITY_PLATFORM_KEYRING=y

CONFIG_IMA=y

CONFIG_IMA_DEFAULT_HASH_SHA256=y

CONFIG_IMA_WRITE_POLICY=y
@@ -766,6 +768,7 @@ CONFIG_ZCRYPT=m 
CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_SYSTEM_BLACKLIST_KEYRING=y

CONFIG_CORDIC=m

CONFIG_PRIME_NUMBERS=m

CONFIG_CRYPTO_LIB_CURVE25519=m
@@ -798,7 +801,6 @@ CONFIG_STACK_TRACER=y 
CONFIG_SCHED_TRACER=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_BPF_KPROBE_OVERRIDE=y

CONFIG_HIST_TRIGGERS=y

CONFIG_SAMPLES=y

CONFIG_SAMPLE_TRACE_PRINTK=m

arch/s390/configs/zfcpdump_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ CONFIG_TUNE_ZEC12=y 
# CONFIG_COMPAT is not set

CONFIG_NR_CPUS=2

CONFIG_HZ_100=y

# CONFIG_RELOCATABLE is not set

# CONFIG_CHSC_SCH is not set

# CONFIG_SCM_BUS is not set

CONFIG_CRASH_DUMP=y
@@ -50,6 +49,7 @@ CONFIG_ZFCP=y 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_LEGACY_TIOCSTI is not set

# CONFIG_HVC_IUCV is not set

# CONFIG_HW_RANDOM_S390 is not set

# CONFIG_HMC_DRV is not set