[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 586b15f6741f21642143d3ad63ed392db9e51135..c703bc7b08800cc4f82298deb0817aa05178f4c7 100644 (file)
--- 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"