[PATCH] Fix warning in do_IRQ (i386)

[Jean Delvare <khali@linux-fr.org>]

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: Jean Delvare <khali@linux-fr.org>
Cc: Björn Steinbrink <B.Steinbrink@gmx.de>
Cc: Arjan van de Ven <arjan@linux.intel.com>
---
 arch/i386/kernel/irq.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.17-git.orig/arch/i386/kernel/irq.c	2006-06-26 21:55:03.000000000 +0200
+++ linux-2.6.17-git/arch/i386/kernel/irq.c	2006-06-26 22:54:49.000000000 +0200
@@ -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"


-- 
Jean Delvare
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/