commit 91bf46026966926f3b63539db423144b8c66eab4
author Andrew Morton <akpm@osdl.org> Tue Jun 27 02:55:09 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Tue Jun 27 17:32:48 2006 -0700
tree 6e132eb0d3b87e959db8e84a045ba28f33739923
parent 775d584c63818595dd6ba635438753cf3c18e4b1

[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>

arch/i386/kernel/irq.c

diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c
index 586b15f..c703bc7 100644
--- a/arch/i386/kernel/irq.c
+++ b/arch/i386/kernel/irq.c
@@ -100,8 +100,8 @@
 		 * 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"