diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-16 18:42:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-16 18:42:20 +0000 |
| commit | bb19a07897898f424c62b4456ba100fd38cfa679 (patch) | |
| tree | 23d7d6dd0e967f6d71e501adeacb856ac300489a /kernel/softirq.c | |
| parent | d56ccc9f08f60732b8b7bf7e002d53b090791aea (diff) | |
| parent | e96eeada2f5d5af76d60939b7d564f3efb0a616f (diff) | |
Merge tag 'v4.4.1-rt6' of git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel into linux-linaro-lsk-v4.4-rtlsk-v4.4-16.02-rt
v4.4.1-rt6
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index d1e999e74d23..2ca63cc1469e 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -563,8 +563,10 @@ static void do_current_softirqs(void) do_single_softirq(i); } softirq_clr_runner(i); - unlock_softirq(i); WARN_ON(current->softirq_nestcnt != 1); + local_irq_enable(); + unlock_softirq(i); + local_irq_disable(); } } |