]> err.no Git - linux-2.6/commitdiff
[POWERPC] Avoid calling get_irq_server() with a real, not virtual irq.
authorMichal Ostrowski <mostrows@watson.ibm.com>
Wed, 20 Dec 2006 13:29:40 +0000 (07:29 -0600)
committerPaul Mackerras <paulus@samba.org>
Tue, 9 Jan 2007 06:03:01 +0000 (17:03 +1100)
We can use default_server when masking an interrupt vector.
get_irq_server() assumes a virtual irq, so badness may happen if we
give it a real one.

Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/platforms/pseries/xics.c

index b5b2b1103de8d58dd2f49b6b766fe4d429913c46..81d172d650389ee206eef128d912028a7bcd4933 100644 (file)
@@ -224,7 +224,6 @@ static void xics_unmask_irq(unsigned int virq)
 static void xics_mask_real_irq(unsigned int irq)
 {
        int call_status;
-       unsigned int server;
 
        if (irq == XICS_IPI)
                return;
@@ -236,9 +235,9 @@ static void xics_mask_real_irq(unsigned int irq)
                return;
        }
 
-       server = get_irq_server(irq);
        /* Have to set XIVE to 0xff to be able to remove a slot */
-       call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server, 0xff);
+       call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq,
+                               default_server, 0xff);
        if (call_status != 0) {
                printk(KERN_ERR "xics_disable_irq: irq=%u: ibm_set_xive(0xff)"
                       " returned %d\n", irq, call_status);