diff --git a/[refs] b/[refs]
index a7b63cc12231..cb2caa309ec3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 157124c11f4217733691223ecf5ee47558ae9495
+refs/heads/master: 94f565598827e2015dce97f4c1ac4871ab84407b
diff --git a/trunk/kernel/Kconfig.hz b/trunk/kernel/Kconfig.hz
index 382dd5a8b2d7..94fabd534b03 100644
--- a/trunk/kernel/Kconfig.hz
+++ b/trunk/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)