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

Commit cb14def6 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/configs: update default configurations 



Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 249c543b

arch/s390/configs/default_defconfig

+12 −15
Original line number Diff line number Diff line
@@ -10,28 +10,35 @@ CONFIG_TASKSTATS=y 
CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NUMA_BALANCING=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_CGROUP_HUGETLB=y

CONFIG_CGROUP_PERF=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_OPROFILE=m

CONFIG_KPROBES=y

CONFIG_JUMP_LABEL=y

CONFIG_STATIC_KEYS_SELFTEST=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y
@@ -64,7 +71,6 @@ CONFIG_HOTPLUG_PCI=y 
CONFIG_HOTPLUG_PCI_S390=y

CONFIG_CHSC_SCH=y

CONFIG_CRASH_DUMP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_HIBERNATION=y

CONFIG_NET=y
@@ -106,7 +112,6 @@ CONFIG_TCP_CONG_LP=m 
CONFIG_TCP_CONG_VENO=m

CONFIG_TCP_CONG_YEAH=m

CONFIG_TCP_CONG_ILLINOIS=m

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m
@@ -457,19 +462,9 @@ CONFIG_INFINIBAND=m 
CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_VIRTIO_BALLOON=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_JBD_DEBUG=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y
@@ -490,7 +485,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y 
CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m

CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m
@@ -542,10 +537,11 @@ CONFIG_DLM=m 
CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_FRAME_WARN=1024

CONFIG_READABLE_ASM=y

CONFIG_UNUSED_SYMBOLS=y

CONFIG_HEADERS_CHECK=y

CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_DEBUG_OBJECTS=y
@@ -588,6 +584,7 @@ CONFIG_FAILSLAB=y 
CONFIG_FAIL_PAGE_ALLOC=y

CONFIG_FAIL_MAKE_REQUEST=y

CONFIG_FAIL_IO_TIMEOUT=y

CONFIG_FAIL_FUTEX=y

CONFIG_FAULT_INJECTION_DEBUG_FS=y

CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_LATENCYTOP=y

arch/s390/configs/gcov_defconfig

+10 −14
Original line number Diff line number Diff line
@@ -10,21 +10,27 @@ CONFIG_TASKSTATS=y 
CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NUMA_BALANCING=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_CGROUP_HUGETLB=y

CONFIG_CGROUP_PERF=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_OPROFILE=m
@@ -61,7 +67,6 @@ CONFIG_HOTPLUG_PCI=y 
CONFIG_HOTPLUG_PCI_S390=y

CONFIG_CHSC_SCH=y

CONFIG_CRASH_DUMP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_HIBERNATION=y

CONFIG_NET=y
@@ -103,7 +108,6 @@ CONFIG_TCP_CONG_LP=m 
CONFIG_TCP_CONG_VENO=m

CONFIG_TCP_CONG_YEAH=m

CONFIG_TCP_CONG_ILLINOIS=m

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m
@@ -453,19 +457,9 @@ CONFIG_INFINIBAND=m 
CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_VIRTIO_BALLOON=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_JBD_DEBUG=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y
@@ -485,7 +479,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y 
CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m

CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m
@@ -550,6 +544,7 @@ CONFIG_NOTIFIER_ERROR_INJECTION=m 
CONFIG_CPU_NOTIFIER_ERROR_INJECT=m

CONFIG_PM_NOTIFIER_ERROR_INJECT=m

CONFIG_LATENCYTOP=y

CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y

CONFIG_BLK_DEV_IO_TRACE=y

# CONFIG_KPROBE_EVENT is not set

CONFIG_LKDTM=m
@@ -557,6 +552,7 @@ CONFIG_RBTREE_TEST=m 
CONFIG_INTERVAL_TREE_TEST=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_BPF=m

# CONFIG_STRICT_DEVMEM is not set

CONFIG_S390_PTDUMP=y

CONFIG_ENCRYPTED_KEYS=m

arch/s390/configs/performance_defconfig

+10 −14
Original line number Diff line number Diff line
@@ -10,22 +10,28 @@ CONFIG_TASKSTATS=y 
CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NUMA_BALANCING=y

# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_CGROUP_HUGETLB=y

CONFIG_CGROUP_PERF=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_OPROFILE=m
@@ -61,7 +67,6 @@ CONFIG_HOTPLUG_PCI=y 
CONFIG_HOTPLUG_PCI_S390=y

CONFIG_CHSC_SCH=y

CONFIG_CRASH_DUMP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=m

CONFIG_HIBERNATION=y

CONFIG_NET=y
@@ -103,7 +108,6 @@ CONFIG_TCP_CONG_LP=m 
CONFIG_TCP_CONG_VENO=m

CONFIG_TCP_CONG_YEAH=m

CONFIG_TCP_CONG_ILLINOIS=m

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m
@@ -453,19 +457,9 @@ CONFIG_INFINIBAND=m 
CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_VIRTIO_BALLOON=m

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_JBD_DEBUG=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y
@@ -485,7 +479,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y 
CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m

CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m
@@ -546,6 +540,7 @@ CONFIG_TIMER_STATS=y 
CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_LATENCYTOP=y

CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y

CONFIG_SCHED_TRACER=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_STACK_TRACER=y
@@ -554,6 +549,7 @@ CONFIG_UPROBE_EVENT=y 
CONFIG_LKDTM=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_BPF=m

# CONFIG_STRICT_DEVMEM is not set

CONFIG_S390_PTDUMP=y

CONFIG_ENCRYPTED_KEYS=m

arch/s390/configs/zfcpdump_defconfig

+2 −8
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ CONFIG_CRASH_DUMP=y 
# CONFIG_SECCOMP is not set

CONFIG_NET=y

# CONFIG_IUCV is not set

CONFIG_ATM=y

CONFIG_ATM_LANE=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

# CONFIG_FIRMWARE_IN_KERNEL is not set
@@ -54,14 +52,10 @@ CONFIG_RAW_DRIVER=y 
# CONFIG_S390_VMUR is not set

# CONFIG_HID is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_CONFIGFS_FS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

arch/s390/defconfig

+27 −3
Original line number Diff line number Diff line
@@ -11,22 +11,31 @@ CONFIG_TASK_IO_ACCOUNTING=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_PIDS=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

CONFIG_CGROUP_HUGETLB=y

CONFIG_CGROUP_PERF=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_CGROUP=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_KPROBES=y

CONFIG_JUMP_LABEL=y

CONFIG_STATIC_KEYS_SELFTEST=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y
@@ -37,6 +46,7 @@ CONFIG_DEFAULT_DEADLINE=y 
CONFIG_LIVEPATCH=y

CONFIG_MARCH_Z196=y

CONFIG_NR_CPUS=256

CONFIG_NUMA=y

CONFIG_HZ_100=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y
@@ -52,7 +62,6 @@ CONFIG_NET_KEY=y 
CONFIG_INET=y

CONFIG_IP_MULTICAST=y

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y

CONFIG_L2TP=m

CONFIG_L2TP_DEBUGFS=m

CONFIG_VLAN_8021Q=y
@@ -89,10 +98,26 @@ CONFIG_BLK_DEV_SR_VENDOR=y 
CONFIG_CHR_DEV_SG=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_SCSI_FC_ATTRS=y

CONFIG_ZFCP=y

CONFIG_SCSI_VIRTIO=y

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_MD_MULTIPATH=m

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=m

CONFIG_DM_SNAPSHOT=m

CONFIG_DM_MIRROR=m

CONFIG_DM_LOG_USERSPACE=m

CONFIG_DM_RAID=m

CONFIG_DM_ZERO=m

CONFIG_DM_MULTIPATH=m

CONFIG_DM_MULTIPATH_QL=m

CONFIG_DM_MULTIPATH_ST=m

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=m

CONFIG_DM_SWITCH=m

CONFIG_NETDEVICES=y

CONFIG_BONDING=m

CONFIG_DUMMY=m
@@ -137,7 +162,6 @@ CONFIG_DEBUG_PI_LIST=y 
CONFIG_DEBUG_SG=y

CONFIG_DEBUG_NOTIFIERS=y

CONFIG_RCU_CPU_STALL_TIMEOUT=60

# CONFIG_RCU_CPU_STALL_INFO is not set

CONFIG_RCU_TRACE=y

CONFIG_LATENCYTOP=y

CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y