diff options
author | Andrew Morton <akpm@osdl.org> | 2005-07-30 19:22:49 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-30 19:49:59 +0200 |
commit | c70f5d6610c601ea2ae4ae4e49f66c80801e895f (patch) | |
tree | 288ab7efcb1285474e7f7277002cba8de236bbf1 /kernel/softirq.c | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus (diff) | |
download | linux-c70f5d6610c601ea2ae4ae4e49f66c80801e895f.tar.xz linux-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>
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 4 |
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) |