diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-06-27 11:55:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-28 02:32:48 +0200 |
| commit | 91bf46026966926f3b63539db423144b8c66eab4 (patch) | |
| tree | 6e132eb0d3b87e959db8e84a045ba28f33739923 /arch/i386 | |
| parent | [PATCH] drivers/message/i2o/iop.c: unexport i2o_msg_nop() (diff) | |
| download | linux-91bf46026966926f3b63539db423144b8c66eab4.tar.xz linux-91bf46026966926f3b63539db423144b8c66eab4.zip | |
[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>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c index 586b15f6741f..c703bc7b0880 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" |