diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 11:32:13 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 11:32:13 +0100 |
| commit | 9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee (patch) | |
| tree | 651f7058bbaa2d8b2855286380d614afcf505118 /kernel/Kconfig.hz | |
| parent | 31db6e9ea1dbdcf66b8227b4f7035dee1b1dd8c0 (diff) | |
| parent | bef69ea0dcce574a425feb0a5aa4c63dd108b9a6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/Kconfig.hz')
| -rw-r--r-- | kernel/Kconfig.hz | 2 |
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) |