aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/Kconfig.hz
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-13 07:56:44 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-13 07:56:44 -0400
commit73909f7a665991013dcff42a815fda76d3a7300a (patch)
tree84bb9899e2204bf6af6fd4f249bb909c2a89faf8 /kernel/Kconfig.hz
parentd6672c501852d577097f6757c311d937aca0b04b (diff)
parent30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff)
Merge commit 'v2.6.27-rc3' into core/urgent
Diffstat (limited to 'kernel/Kconfig.hz')
-rw-r--r--kernel/Kconfig.hz2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
index 382dd5a8b2d7..94fabd534b03 100644
--- a/kernel/Kconfig.hz
+++ b/kernel/Kconfig.hz
@@ -55,4 +55,4 @@ config HZ
55 default 1000 if HZ_1000 55 default 1000 if HZ_1000
56 56
57config SCHED_HRTICK 57config SCHED_HRTICK
58 def_bool HIGH_RES_TIMERS && USE_GENERIC_SMP_HELPERS 58 def_bool HIGH_RES_TIMERS && (!SMP || USE_GENERIC_SMP_HELPERS)