From a6e93448d0bc640b924919228a80daada2d3bec4 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Sun, 6 Dec 2009 17:48:33 +0000 Subject: [PATCH] --- yaml --- r: 178167 b: refs/heads/master c: 030bdc3fd0807b6097a937468859f4b4baf1b950 h: refs/heads/master i: 178165: 0d8e2de4aa8dffd4966fa94318d688e2d150f402 178163: 2000232d95858347162f443b6d8b6abf6db60a95 178159: 6c43524a1a6f130c202aa8d9d981696a24d15e1e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/configs/ppc64_defconfig | 6 +++--- trunk/arch/powerpc/configs/pseries_defconfig | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d46093658456..025f13084958 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55f2fa147392ffd23cec56cbb3d85ab5b3ebc125 +refs/heads/master: 030bdc3fd0807b6097a937468859f4b4baf1b950 diff --git a/trunk/arch/powerpc/configs/ppc64_defconfig b/trunk/arch/powerpc/configs/ppc64_defconfig index 4b043f973389..7b3804a6e363 100644 --- a/trunk/arch/powerpc/configs/ppc64_defconfig +++ b/trunk/arch/powerpc/configs/ppc64_defconfig @@ -304,11 +304,11 @@ CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set -CONFIG_HZ=250 +CONFIG_HZ=100 CONFIG_SCHED_HRTICK=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set diff --git a/trunk/arch/powerpc/configs/pseries_defconfig b/trunk/arch/powerpc/configs/pseries_defconfig index e89fccbb4a61..ca9ff9aad74a 100644 --- a/trunk/arch/powerpc/configs/pseries_defconfig +++ b/trunk/arch/powerpc/configs/pseries_defconfig @@ -230,11 +230,11 @@ CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set -CONFIG_HZ=250 +CONFIG_HZ=100 CONFIG_SCHED_HRTICK=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set