[linux-yocto] [PATCH 45/48] Revert "kernel: softirq: unlock with irqs on"

[Daniel Dragomir]

From: Daniel Bristot de Oliveira <bristot at redhat.com>

This reverts commit 93bc0e814e212229047d2b5c9690493ef8d9da2e.

Signed-off-by: Daniel Bristot de Oliveira <bristot at redhat.com>
Signed-off-by: Charlie Paul <cpaul.windriver at gmail.com>
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1423432
---
 kernel/softirq.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 819bd7c..cc7f5d5 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -574,10 +574,8 @@ static void do_current_softirqs(void)
 			do_single_softirq(i);
 		}
 		softirq_clr_runner(i);
-		WARN_ON(current->softirq_nestcnt != 1);
-		local_irq_enable();
 		unlock_softirq(i);
-		local_irq_disable();
+		WARN_ON(current->softirq_nestcnt != 1);
 	}
 }
 
-- 
2.7.4