diff options
Diffstat (limited to 'arch/s390/defconfig')
-rw-r--r-- | arch/s390/defconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 37d2bf26796..f39cd710980 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig | |||
@@ -7,13 +7,16 @@ CONFIG_TASK_DELAY_ACCT=y | |||
7 | CONFIG_TASK_XACCT=y | 7 | CONFIG_TASK_XACCT=y |
8 | CONFIG_TASK_IO_ACCOUNTING=y | 8 | CONFIG_TASK_IO_ACCOUNTING=y |
9 | CONFIG_AUDIT=y | 9 | CONFIG_AUDIT=y |
10 | CONFIG_NO_HZ=y | ||
11 | CONFIG_HIGH_RES_TIMERS=y | ||
12 | CONFIG_RCU_FAST_NO_HZ=y | ||
10 | CONFIG_IKCONFIG=y | 13 | CONFIG_IKCONFIG=y |
11 | CONFIG_IKCONFIG_PROC=y | 14 | CONFIG_IKCONFIG_PROC=y |
12 | CONFIG_CGROUPS=y | 15 | CONFIG_CGROUPS=y |
13 | CONFIG_CPUSETS=y | 16 | CONFIG_CPUSETS=y |
14 | CONFIG_CGROUP_CPUACCT=y | 17 | CONFIG_CGROUP_CPUACCT=y |
15 | CONFIG_RESOURCE_COUNTERS=y | 18 | CONFIG_RESOURCE_COUNTERS=y |
16 | CONFIG_CGROUP_MEM_RES_CTLR=y | 19 | CONFIG_CGROUP_MEMCG=y |
17 | CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y | 20 | CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y |
18 | CONFIG_CGROUP_SCHED=y | 21 | CONFIG_CGROUP_SCHED=y |
19 | CONFIG_RT_GROUP_SCHED=y | 22 | CONFIG_RT_GROUP_SCHED=y |
@@ -35,8 +38,6 @@ CONFIG_MODVERSIONS=y | |||
35 | CONFIG_PARTITION_ADVANCED=y | 38 | CONFIG_PARTITION_ADVANCED=y |
36 | CONFIG_IBM_PARTITION=y | 39 | CONFIG_IBM_PARTITION=y |
37 | CONFIG_DEFAULT_DEADLINE=y | 40 | CONFIG_DEFAULT_DEADLINE=y |
38 | CONFIG_NO_HZ=y | ||
39 | CONFIG_HIGH_RES_TIMERS=y | ||
40 | CONFIG_PREEMPT=y | 41 | CONFIG_PREEMPT=y |
41 | CONFIG_MEMORY_HOTPLUG=y | 42 | CONFIG_MEMORY_HOTPLUG=y |
42 | CONFIG_MEMORY_HOTREMOVE=y | 43 | CONFIG_MEMORY_HOTREMOVE=y |