summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-07-30 10:22:49 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-30 10:49:59 -0700
commitc70f5d6610c601ea2ae4ae4e49f66c80801e895f (patch)
tree288ab7efcb1285474e7f7277002cba8de236bbf1
parent6d1d07e41a1de478a0da3cc14b4a8054ef09931c (diff)
downloadlwn-c70f5d6610c601ea2ae4ae4e49f66c80801e895f.tar.gz
lwn-c70f5d6610c601ea2ae4ae4e49f66c80801e895f.zip
[PATCH] revert bogus softirq changes
This snuck in with an x86_64 change. Thanks to Richard Purdie <rpurdie@rpsys.net> for spotting it. Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--kernel/softirq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 31007d6542cc..b4ab6af1dea8 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)