Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / parisc / iosapic.c

diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 501aaf1f253f28c4af811d747d1d0461f790133d..73348c4047e98d249a9a576b87f2e8d44edaf623 100644 (file)
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -714,7 +714,7 @@ static void iosapic_set_affinity_irq(unsigned int irq,
        if (dest_cpu < 0)
                return;
 
-       irq_desc[irq].affinity = cpumask_of_cpu(dest_cpu);
+       cpumask_copy(irq_desc[irq].affinity, cpumask_of(dest_cpu));
        vi->txn_addr = txn_affinity_addr(irq, dest_cpu);
 
        spin_lock_irqsave(&iosapic_lock, flags);