Merge branch 'akpm' (patches from Andrew Morton)

[~andy/linux] / kernel / Kconfig.hz

diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz
index 526128a2e62297630c3207f263e80a4879659003..94fabd534b03d9347dc117b653204fa838283def 100644 (file)
--- 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 && X86
+       def_bool HIGH_RES_TIMERS && (!SMP || USE_GENERIC_SMP_HELPERS)