aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-09-04 08:13:18 -0400
committerHeiko Carstens <heiko.carstens@de.ibm.com>2013-09-04 11:19:01 -0400
commit3b459c542193189f4165e86881f0ecf09f527bcf (patch)
tree4122a963b3d09a7d15e3f3335852a0fcc30f52a5 /arch/s390
parent4784955a5270f30c569fa95899979fd1805caf6c (diff)
s390: update defconfig
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/defconfig39
1 files changed, 27 insertions, 12 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index b74400e3e035..d204c65bf722 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -1,14 +1,13 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 2CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y 3CONFIG_FHANDLE=y
4CONFIG_AUDIT=y
5CONFIG_NO_HZ=y
6CONFIG_HIGH_RES_TIMERS=y
5CONFIG_TASKSTATS=y 7CONFIG_TASKSTATS=y
6CONFIG_TASK_DELAY_ACCT=y 8CONFIG_TASK_DELAY_ACCT=y
7CONFIG_TASK_XACCT=y 9CONFIG_TASK_XACCT=y
8CONFIG_TASK_IO_ACCOUNTING=y 10CONFIG_TASK_IO_ACCOUNTING=y
9CONFIG_AUDIT=y
10CONFIG_NO_HZ=y
11CONFIG_HIGH_RES_TIMERS=y
12CONFIG_RCU_FAST_NO_HZ=y 11CONFIG_RCU_FAST_NO_HZ=y
13CONFIG_IKCONFIG=y 12CONFIG_IKCONFIG=y
14CONFIG_IKCONFIG_PROC=y 13CONFIG_IKCONFIG_PROC=y
@@ -27,6 +26,7 @@ CONFIG_RD_BZIP2=y
27CONFIG_RD_LZMA=y 26CONFIG_RD_LZMA=y
28CONFIG_RD_XZ=y 27CONFIG_RD_XZ=y
29CONFIG_RD_LZO=y 28CONFIG_RD_LZO=y
29CONFIG_RD_LZ4=y
30CONFIG_EXPERT=y 30CONFIG_EXPERT=y
31# CONFIG_COMPAT_BRK is not set 31# CONFIG_COMPAT_BRK is not set
32CONFIG_PROFILING=y 32CONFIG_PROFILING=y
@@ -38,11 +38,13 @@ CONFIG_MODULE_UNLOAD=y
38CONFIG_MODVERSIONS=y 38CONFIG_MODVERSIONS=y
39CONFIG_PARTITION_ADVANCED=y 39CONFIG_PARTITION_ADVANCED=y
40CONFIG_IBM_PARTITION=y 40CONFIG_IBM_PARTITION=y
41# CONFIG_EFI_PARTITION is not set
41CONFIG_DEFAULT_DEADLINE=y 42CONFIG_DEFAULT_DEADLINE=y
42CONFIG_HZ_100=y 43CONFIG_HZ_100=y
43CONFIG_MEMORY_HOTPLUG=y 44CONFIG_MEMORY_HOTPLUG=y
44CONFIG_MEMORY_HOTREMOVE=y 45CONFIG_MEMORY_HOTREMOVE=y
45CONFIG_KSM=y 46CONFIG_KSM=y
47CONFIG_TRANSPARENT_HUGEPAGE=y
46CONFIG_CRASH_DUMP=y 48CONFIG_CRASH_DUMP=y
47CONFIG_BINFMT_MISC=m 49CONFIG_BINFMT_MISC=m
48CONFIG_HIBERNATION=y 50CONFIG_HIBERNATION=y
@@ -92,40 +94,49 @@ CONFIG_SCSI_CONSTANTS=y
92CONFIG_SCSI_LOGGING=y 94CONFIG_SCSI_LOGGING=y
93CONFIG_SCSI_SCAN_ASYNC=y 95CONFIG_SCSI_SCAN_ASYNC=y
94CONFIG_ZFCP=y 96CONFIG_ZFCP=y
97CONFIG_SCSI_VIRTIO=y
95CONFIG_NETDEVICES=y 98CONFIG_NETDEVICES=y
96CONFIG_BONDING=m 99CONFIG_BONDING=m
97CONFIG_DUMMY=m 100CONFIG_DUMMY=m
98CONFIG_EQUALIZER=m 101CONFIG_EQUALIZER=m
99CONFIG_TUN=m 102CONFIG_TUN=m
100CONFIG_VIRTIO_NET=y 103CONFIG_VIRTIO_NET=y
104# CONFIG_INPUT is not set
105# CONFIG_SERIO is not set
101CONFIG_RAW_DRIVER=m 106CONFIG_RAW_DRIVER=m
102CONFIG_VIRTIO_BALLOON=y 107CONFIG_VIRTIO_BALLOON=y
103CONFIG_EXT2_FS=y
104CONFIG_EXT3_FS=y
105# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
106CONFIG_EXT4_FS=y 108CONFIG_EXT4_FS=y
107CONFIG_EXT4_FS_POSIX_ACL=y 109CONFIG_EXT4_FS_POSIX_ACL=y
108CONFIG_EXT4_FS_SECURITY=y 110CONFIG_EXT4_FS_SECURITY=y
111CONFIG_XFS_FS=y
112CONFIG_XFS_QUOTA=y
113CONFIG_XFS_POSIX_ACL=y
114CONFIG_XFS_RT=y
115CONFIG_BTRFS_FS=y
116CONFIG_BTRFS_FS_POSIX_ACL=y
117CONFIG_FANOTIFY=y
118CONFIG_FUSE_FS=y
109CONFIG_PROC_KCORE=y 119CONFIG_PROC_KCORE=y
110CONFIG_TMPFS=y 120CONFIG_TMPFS=y
111CONFIG_TMPFS_POSIX_ACL=y 121CONFIG_TMPFS_POSIX_ACL=y
122CONFIG_HUGETLBFS=y
112# CONFIG_NETWORK_FILESYSTEMS is not set 123# CONFIG_NETWORK_FILESYSTEMS is not set
124CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
113CONFIG_MAGIC_SYSRQ=y 125CONFIG_MAGIC_SYSRQ=y
126CONFIG_DEBUG_PAGEALLOC=y
114CONFIG_TIMER_STATS=y 127CONFIG_TIMER_STATS=y
115CONFIG_PROVE_LOCKING=y 128CONFIG_PROVE_LOCKING=y
116CONFIG_PROVE_RCU=y
117CONFIG_LOCK_STAT=y 129CONFIG_LOCK_STAT=y
118CONFIG_DEBUG_LOCKDEP=y 130CONFIG_DEBUG_LOCKDEP=y
119CONFIG_DEBUG_LIST=y 131CONFIG_DEBUG_LIST=y
120CONFIG_DEBUG_NOTIFIERS=y 132CONFIG_DEBUG_NOTIFIERS=y
133CONFIG_PROVE_RCU=y
134CONFIG_RCU_CPU_STALL_TIMEOUT=60
121CONFIG_RCU_TRACE=y 135CONFIG_RCU_TRACE=y
122CONFIG_KPROBES_SANITY_TEST=y
123CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
124CONFIG_LATENCYTOP=y 136CONFIG_LATENCYTOP=y
125CONFIG_DEBUG_PAGEALLOC=y
126CONFIG_BLK_DEV_IO_TRACE=y 137CONFIG_BLK_DEV_IO_TRACE=y
138CONFIG_KPROBES_SANITY_TEST=y
127# CONFIG_STRICT_DEVMEM is not set 139# CONFIG_STRICT_DEVMEM is not set
128CONFIG_CRYPTO_NULL=m
129CONFIG_CRYPTO_CRYPTD=m 140CONFIG_CRYPTO_CRYPTD=m
130CONFIG_CRYPTO_AUTHENC=m 141CONFIG_CRYPTO_AUTHENC=m
131CONFIG_CRYPTO_TEST=m 142CONFIG_CRYPTO_TEST=m
@@ -137,8 +148,10 @@ CONFIG_CRYPTO_ECB=m
137CONFIG_CRYPTO_LRW=m 148CONFIG_CRYPTO_LRW=m
138CONFIG_CRYPTO_PCBC=m 149CONFIG_CRYPTO_PCBC=m
139CONFIG_CRYPTO_XTS=m 150CONFIG_CRYPTO_XTS=m
151CONFIG_CRYPTO_CMAC=m
140CONFIG_CRYPTO_XCBC=m 152CONFIG_CRYPTO_XCBC=m
141CONFIG_CRYPTO_VMAC=m 153CONFIG_CRYPTO_VMAC=m
154CONFIG_CRYPTO_CRC32=m
142CONFIG_CRYPTO_MD4=m 155CONFIG_CRYPTO_MD4=m
143CONFIG_CRYPTO_MICHAEL_MIC=m 156CONFIG_CRYPTO_MICHAEL_MIC=m
144CONFIG_CRYPTO_RMD128=m 157CONFIG_CRYPTO_RMD128=m
@@ -165,6 +178,8 @@ CONFIG_CRYPTO_TWOFISH=m
165CONFIG_CRYPTO_DEFLATE=m 178CONFIG_CRYPTO_DEFLATE=m
166CONFIG_CRYPTO_ZLIB=m 179CONFIG_CRYPTO_ZLIB=m
167CONFIG_CRYPTO_LZO=m 180CONFIG_CRYPTO_LZO=m
181CONFIG_CRYPTO_LZ4=m
182CONFIG_CRYPTO_LZ4HC=m
168CONFIG_ZCRYPT=m 183CONFIG_ZCRYPT=m
169CONFIG_CRYPTO_SHA1_S390=m 184CONFIG_CRYPTO_SHA1_S390=m
170CONFIG_CRYPTO_SHA256_S390=m 185CONFIG_CRYPTO_SHA256_S390=m