diff --git a/[refs] b/[refs]
index a7ba72615755..756c1ddfbbb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a57c228935fd55c4a1cf7c0b7823537c81914000
+refs/heads/master: 07a80e49240ff57bccc3c65944d35947c3d33697
diff --git a/trunk/arch/mips/kernel/cevt-bcm1480.c b/trunk/arch/mips/kernel/cevt-bcm1480.c
index 21e6d63eb4d1..f6fcc62ade3a 100644
--- a/trunk/arch/mips/kernel/cevt-bcm1480.c
+++ b/trunk/arch/mips/kernel/cevt-bcm1480.c
@@ -143,7 +143,10 @@ void __cpuinit sb1480_clockevent_init(void)
 
 	action->handler	= sibyte_counter_handler;
 	action->flags	= IRQF_DISABLED | IRQF_PERCPU;
+	action->mask	= cpumask_of_cpu(cpu);
 	action->name	= name;
 	action->dev_id	= cd;
+
+	irq_set_affinity(irq, cpumask_of_cpu(cpu));
 	setup_irq(irq, action);
 }
diff --git a/trunk/arch/mips/kernel/cevt-sb1250.c b/trunk/arch/mips/kernel/cevt-sb1250.c
index e2029d0fc39b..194e0f726fe8 100644
--- a/trunk/arch/mips/kernel/cevt-sb1250.c
+++ b/trunk/arch/mips/kernel/cevt-sb1250.c
@@ -142,7 +142,10 @@ void __cpuinit sb1250_clockevent_init(void)
 
 	action->handler	= sibyte_counter_handler;
 	action->flags	= IRQF_DISABLED | IRQF_PERCPU;
+	action->mask	= cpumask_of_cpu(cpu);
 	action->name	= name;
 	action->dev_id	= cd;
+
+	irq_set_affinity(irq, cpumask_of_cpu(cpu));
 	setup_irq(irq, action);
 }