[patch] PS3: Fix unlikely typo in ps3_get_irq

Geoff Levand geoffrey.levand at am.sony.com
Fri Feb 29 08:05:39 EST 2008


From: Roel Kluin <12o3l at tiscali.nl>

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 at tiscali.nl>
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
---
Hi Paul,

Please apply for 2.6.25.

-Geoff

 arch/powerpc/platforms/ps3/interrupt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -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));






More information about the Linuxppc-dev mailing list