aboutsummaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2012-07-26 10:46:05 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-07-26 16:24:20 +0200
commit216550e4fd5ade3f255bd5460db6b59e57f5f8c2 (patch)
tree4291b1ceb4fff8e497d1c43bc6bfbeb2bbc291cc /arch/s390
parent0f6f281b731d20bfe75c13f85d33f3f05b440222 (diff)
downloadlinux-linaro-stable-216550e4fd5ade3f255bd5460db6b59e57f5f8c2.tar.gz
s390: update defconfig
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 37d2bf267964..967923dea98d 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -7,6 +7,9 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_AUDIT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_RCU_FAST_NO_HZ=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_CGROUPS=y
@@ -35,8 +38,6 @@ CONFIG_MODVERSIONS=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_IBM_PARTITION=y
CONFIG_DEFAULT_DEADLINE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
CONFIG_PREEMPT=y
CONFIG_MEMORY_HOTPLUG=y
CONFIG_MEMORY_HOTREMOVE=y