From af9d6c2b86ebf10bb5346a051590a68cb1ce2fc8 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 30 Jul 2005 10:22:49 -0700 Subject: [PATCH] --- yaml --- r: 5522 b: refs/heads/master c: c70f5d6610c601ea2ae4ae4e49f66c80801e895f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/softirq.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0ec130538821..5c31c4aff889 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d1d07e41a1de478a0da3cc14b4a8054ef09931c +refs/heads/master: c70f5d6610c601ea2ae4ae4e49f66c80801e895f diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c index 31007d6542cc..b4ab6af1dea8 100644 --- a/trunk/kernel/softirq.c +++ b/trunk/kernel/softirq.c @@ -86,7 +86,7 @@ asmlinkage void __do_softirq(void) /* Reset the pending bitmask before enabling irqs */ local_softirq_pending() = 0; - //local_irq_enable(); + local_irq_enable(); h = softirq_vec; @@ -99,7 +99,7 @@ asmlinkage void __do_softirq(void) pending >>= 1; } while (pending); - //local_irq_disable(); + local_irq_disable(); pending = local_softirq_pending(); if (pending && --max_restart)