]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
[PATCH] do_IRQ() warning fix
authorAndrew Morton <akpm@osdl.org>
Tue, 27 Jun 2006 09:55:09 +0000 (02:55 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 28 Jun 2006 00:32:48 +0000 (17:32 -0700)
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>
arch/i386/kernel/irq.c

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