]> err.no Git - linux-2.6/commitdiff
[POWERPC] PS3: Fix unlikely typo in ps3_get_irq
authorRoel Kluin <12o3l@tiscali.nl>
Thu, 27 Mar 2008 00:37:18 +0000 (11:37 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 1 Apr 2008 09:43:07 +0000 (20:43 +1100)
Fix a typo bug 'unlikely(x) == y' and add an unlikely() call to
an unlikely code path in the PS3 interrupt routine ps3_get_irq().

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/platforms/ps3/interrupt.c

index 3a6db04aa9405a87d7098a41c945a77ba950f143..a14e5cdc2fed758862ef2e5de522831955b16810 100644 (file)
@@ -709,7 +709,7 @@ static unsigned int ps3_get_irq(void)
        asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x));
        plug &= 0x3f;
 
-       if (unlikely(plug) == NO_IRQ) {
+       if (unlikely(plug == NO_IRQ)) {
                pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__,
                        __LINE__, pd->thread_id);
                dump_bmp(&per_cpu(ps3_private, 0));