aboutsummaryrefslogtreecommitdiff
path: root/kernel/Kconfig.hz
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-13 13:08:47 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-13 13:08:47 +0200
commita12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch)
tree957c915298b299902aa80afa7c78e94c71b3dc25 /kernel/Kconfig.hz
parent7b27718bdb1b70166383dec91391df5534d449ee (diff)
parent30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff)
Merge commit 'v2.6.27-rc3' into x86/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 382dd5a8b2d..94fabd534b0 100644
--- a/kernel/Kconfig.hz
+++ b/kernel/Kconfig.hz
@@ -55,4 +55,4 @@ config HZ
default 1000 if HZ_1000
config SCHED_HRTICK
- def_bool HIGH_RES_TIMERS && USE_GENERIC_SMP_HELPERS
+ def_bool HIGH_RES_TIMERS && (!SMP || USE_GENERIC_SMP_HELPERS)