From: Andrew Morton <akpm@osdl.org>
Date: Tue, 27 Jun 2006 09:55:09 +0000 (-0700)
Subject: [PATCH] do_IRQ() warning fix
X-Git-Tag: v2.6.18-rc1~479
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91bf46026966926f3b63539db423144b8c66eab4;p=linux-2.6

[PATCH] do_IRQ() warning fix

arch/i386/kernel/irq.c: In function 'do_IRQ':
arch/i386/kernel/irq.c:104: warning: suggest parentheses around arithmetic in operand of |

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c
index 586b15f674..c703bc7b08 100644
--- a/arch/i386/kernel/irq.c
+++ b/arch/i386/kernel/irq.c
@@ -100,8 +100,8 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)
 		 * softirq checks work in the hardirq context.
 		 */
 		irqctx->tinfo.preempt_count =
-			irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK |
-			curctx->tinfo.preempt_count & SOFTIRQ_MASK;
+			(irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
+			(curctx->tinfo.preempt_count & SOFTIRQ_MASK);
 
 		asm volatile(
 			"       xchgl   %%ebx,%%esp      \n"