diff --git a/[refs] b/[refs]
index 6d734ba5337a..13d048c6505d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a13ecd7b2f8008659e91213f2803f269f1d8edf
+refs/heads/master: 22df3f53e33d55335e1ef43d4e6ead54b379b3a2
diff --git a/trunk/arch/mips/kernel/cevt-r4k.c b/trunk/arch/mips/kernel/cevt-r4k.c
index ae2984fff580..cb46b02e02a5 100644
--- a/trunk/arch/mips/kernel/cevt-r4k.c
+++ b/trunk/arch/mips/kernel/cevt-r4k.c
@@ -220,7 +220,7 @@ void __cpuinit mips_clockevent_init(void)
 	struct clock_event_device *cd;
 	unsigned int irq = MIPS_CPU_IRQ_BASE + 7;
 
-	if (!cpu_has_counter)
+	if (!cpu_has_counter || !mips_hpt_frequency)
 		return;
 
 #ifdef CONFIG_MIPS_MT_SMTC