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