From: Andrew Morton Date: Sat, 30 Jul 2005 17:22:49 +0000 (-0700) Subject: [PATCH] revert bogus softirq changes X-Git-Tag: v2.6.13-rc5~50 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c70f5d6610c601ea2ae4ae4e49f66c80801e895f;p=linux-2.6-omap-h63xx.git [PATCH] revert bogus softirq changes This snuck in with an x86_64 change. Thanks to Richard Purdie for spotting it. Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/kernel/softirq.c b/kernel/softirq.c index 31007d6542c..b4ab6af1dea 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -86,7 +86,7 @@ restart: /* Reset the pending bitmask before enabling irqs */ local_softirq_pending() = 0; - //local_irq_enable(); + local_irq_enable(); h = softirq_vec; @@ -99,7 +99,7 @@ restart: pending >>= 1; } while (pending); - //local_irq_disable(); + local_irq_disable(); pending = local_softirq_pending(); if (pending && --max_restart)