diff --git a/[refs] b/[refs]
index dc0d464552b8..d15cf3aa6c33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e9c4ec61a80a2058a600c9ac8ad3b15574b1201
+refs/heads/master: 2a2b2212986a4072d11e521a63672e3219173437
diff --git a/trunk/arch/mips/kernel/smtc.c b/trunk/arch/mips/kernel/smtc.c
index 39c08254b0f1..14c64235a24b 100644
--- a/trunk/arch/mips/kernel/smtc.c
+++ b/trunk/arch/mips/kernel/smtc.c
@@ -679,6 +679,7 @@ void smtc_set_irq_affinity(unsigned int irq, cpumask_t affinity)
 
 void smtc_forward_irq(unsigned int irq)
 {
+	struct irq_data *d = irq_get_irq_data(irq);
 	int target;
 
 	/*
@@ -692,7 +693,7 @@ void smtc_forward_irq(unsigned int irq)
 	 * and efficiency, we just pick the easiest one to find.
 	 */
 
-	target = cpumask_first(irq_desc[irq].affinity);
+	target = cpumask_first(d->affinity);
 
 	/*
 	 * We depend on the platform code to have correctly processed