From a8596d83621cc8c8ce4a41a54e9bd72a9664bceb Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Thu, 26 Jul 2012 10:46:05 +0200 Subject: [PATCH] --- yaml --- r: 320427 b: refs/heads/master c: 216550e4fd5ade3f255bd5460db6b59e57f5f8c2 h: refs/heads/master i: 320425: ea3f50deb7be6ed1bb094f8df9a318b18d19fbaa 320423: 65ca3ec8878d46cacdc958a440710fc7ba33818e v: v3 --- [refs] | 2 +- trunk/arch/s390/defconfig | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c97395a9d237..2df818c2faf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f6f281b731d20bfe75c13f85d33f3f05b440222 +refs/heads/master: 216550e4fd5ade3f255bd5460db6b59e57f5f8c2 diff --git a/trunk/arch/s390/defconfig b/trunk/arch/s390/defconfig index 37d2bf267964..967923dea98d 100644 --- a/trunk/arch/s390/defconfig +++ b/trunk/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