2008-02-24 08:21:44

by Samuel Tardieu

Subject: [PATCH] ps3: Fix "unlikely" incorrect usage

Fix unlikely(plug) == NO_IRQ into unlikely(plug == NO_IRQ).

Signed-off-by: Samuel Tardieu <[email protected]>
---
arch/powerpc/platforms/ps3/interrupt.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index 3a6db04..a14e5cd 100644
--- 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));
--
1.5.4.2.197.g22c43

2008-02-24 18:53:04

by Geoff Levand

Subject: Re: [PATCH] ps3: Fix "unlikely" incorrect usage

On 02/24/2008 12:06 AM, Samuel Tardieu wrote:
> Fix unlikely(plug) == NO_IRQ into unlikely(plug == NO_IRQ).
>
> Signed-off-by: Samuel Tardieu <[email protected]>
> ---
> arch/powerpc/platforms/ps3/interrupt.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

Thanks for the submission, but this fix is already in
ps3-linux.git. I was waiting to collect a few other bugs
before sending it to Paul.

-Geoff