MIPS: SMTC: Use irq_data in smtc_forward_irq()

[mv-sheeva.git] / arch / mips / kernel / smtc.c

diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index cfeb2c1558967a540df6be261478df57c73a440f..14c64235a24b1876abb6e9741408d68052fa0c87 100644 (file)
--- a/arch/mips/kernel/smtc.c
+++ b/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
@@ -1038,7 +1039,7 @@ void deferred_smtc_ipi(void)
                 * but it's more efficient, given that we're already
                 * running down the IPI queue.
                 */
-               __raw_local_irq_restore(flags);
+               __arch_local_irq_restore(flags);
        }
 }
 
@@ -1190,7 +1191,7 @@ void smtc_ipi_replay(void)
                /*
                 ** But use a raw restore here to avoid recursion.
                 */
-               __raw_local_irq_restore(flags);
+               __arch_local_irq_restore(flags);
 
                if (pipi) {
                        self_ipi(pipi);