diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-08-16 06:07:02 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-09-26 09:45:29 -0400 |
commit | c397031f58f9a0a5d808dc998105781b1945b6fe (patch) | |
tree | cb01e8896d750ee47930cb99fba4c9c098a0c0e6 | |
parent | 0eccc783d85f5edd28497c1f1a62faba392b04eb (diff) |
s390: update defconfig
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r-- | arch/s390/defconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index f39cd710980b..b74400e3e035 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig | |||
@@ -16,8 +16,8 @@ CONFIG_CGROUPS=y | |||
16 | CONFIG_CPUSETS=y | 16 | CONFIG_CPUSETS=y |
17 | CONFIG_CGROUP_CPUACCT=y | 17 | CONFIG_CGROUP_CPUACCT=y |
18 | CONFIG_RESOURCE_COUNTERS=y | 18 | CONFIG_RESOURCE_COUNTERS=y |
19 | CONFIG_CGROUP_MEMCG=y | 19 | CONFIG_MEMCG=y |
20 | CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y | 20 | CONFIG_MEMCG_SWAP=y |
21 | CONFIG_CGROUP_SCHED=y | 21 | CONFIG_CGROUP_SCHED=y |
22 | CONFIG_RT_GROUP_SCHED=y | 22 | CONFIG_RT_GROUP_SCHED=y |
23 | CONFIG_BLK_CGROUP=y | 23 | CONFIG_BLK_CGROUP=y |
@@ -32,20 +32,19 @@ CONFIG_EXPERT=y | |||
32 | CONFIG_PROFILING=y | 32 | CONFIG_PROFILING=y |
33 | CONFIG_OPROFILE=y | 33 | CONFIG_OPROFILE=y |
34 | CONFIG_KPROBES=y | 34 | CONFIG_KPROBES=y |
35 | CONFIG_JUMP_LABEL=y | ||
35 | CONFIG_MODULES=y | 36 | CONFIG_MODULES=y |
36 | CONFIG_MODULE_UNLOAD=y | 37 | CONFIG_MODULE_UNLOAD=y |
37 | CONFIG_MODVERSIONS=y | 38 | CONFIG_MODVERSIONS=y |
38 | CONFIG_PARTITION_ADVANCED=y | 39 | CONFIG_PARTITION_ADVANCED=y |
39 | CONFIG_IBM_PARTITION=y | 40 | CONFIG_IBM_PARTITION=y |
40 | CONFIG_DEFAULT_DEADLINE=y | 41 | CONFIG_DEFAULT_DEADLINE=y |
41 | CONFIG_PREEMPT=y | 42 | CONFIG_HZ_100=y |
42 | CONFIG_MEMORY_HOTPLUG=y | 43 | CONFIG_MEMORY_HOTPLUG=y |
43 | CONFIG_MEMORY_HOTREMOVE=y | 44 | CONFIG_MEMORY_HOTREMOVE=y |
44 | CONFIG_KSM=y | 45 | CONFIG_KSM=y |
45 | CONFIG_BINFMT_MISC=m | ||
46 | CONFIG_CMM=m | ||
47 | CONFIG_HZ_100=y | ||
48 | CONFIG_CRASH_DUMP=y | 46 | CONFIG_CRASH_DUMP=y |
47 | CONFIG_BINFMT_MISC=m | ||
49 | CONFIG_HIBERNATION=y | 48 | CONFIG_HIBERNATION=y |
50 | CONFIG_PACKET=y | 49 | CONFIG_PACKET=y |
51 | CONFIG_UNIX=y | 50 | CONFIG_UNIX=y |
@@ -75,6 +74,7 @@ CONFIG_NET_CLS_RSVP=m | |||
75 | CONFIG_NET_CLS_RSVP6=m | 74 | CONFIG_NET_CLS_RSVP6=m |
76 | CONFIG_NET_CLS_ACT=y | 75 | CONFIG_NET_CLS_ACT=y |
77 | CONFIG_NET_ACT_POLICE=y | 76 | CONFIG_NET_ACT_POLICE=y |
77 | CONFIG_BPF_JIT=y | ||
78 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 78 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
79 | CONFIG_DEVTMPFS=y | 79 | CONFIG_DEVTMPFS=y |
80 | CONFIG_BLK_DEV_LOOP=m | 80 | CONFIG_BLK_DEV_LOOP=m |
@@ -121,7 +121,6 @@ CONFIG_DEBUG_NOTIFIERS=y | |||
121 | CONFIG_RCU_TRACE=y | 121 | CONFIG_RCU_TRACE=y |
122 | CONFIG_KPROBES_SANITY_TEST=y | 122 | CONFIG_KPROBES_SANITY_TEST=y |
123 | CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y | 123 | CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y |
124 | CONFIG_CPU_NOTIFIER_ERROR_INJECT=m | ||
125 | CONFIG_LATENCYTOP=y | 124 | CONFIG_LATENCYTOP=y |
126 | CONFIG_DEBUG_PAGEALLOC=y | 125 | CONFIG_DEBUG_PAGEALLOC=y |
127 | CONFIG_BLK_DEV_IO_TRACE=y | 126 | CONFIG_BLK_DEV_IO_TRACE=y |
@@ -173,3 +172,4 @@ CONFIG_CRYPTO_SHA512_S390=m | |||
173 | CONFIG_CRYPTO_DES_S390=m | 172 | CONFIG_CRYPTO_DES_S390=m |
174 | CONFIG_CRYPTO_AES_S390=m | 173 | CONFIG_CRYPTO_AES_S390=m |
175 | CONFIG_CRC7=m | 174 | CONFIG_CRC7=m |
175 | CONFIG_CMM=m | ||