From 3b65946390a2796ea547ac3c07dbee31088a9023 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 27 Jun 2006 02:55:09 -0700 Subject: [PATCH] --- yaml --- r: 30826 b: refs/heads/master c: 91bf46026966926f3b63539db423144b8c66eab4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/irq.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a78795cfdd83..451566fea727 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 775d584c63818595dd6ba635438753cf3c18e4b1 +refs/heads/master: 91bf46026966926f3b63539db423144b8c66eab4 diff --git a/trunk/arch/i386/kernel/irq.c b/trunk/arch/i386/kernel/irq.c index 586b15f6741f..c703bc7b0880 100644 --- a/trunk/arch/i386/kernel/irq.c +++ b/trunk/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"