diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/rcupdate.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c index 6df1559b1c02..13458bbaa1be 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c | |||
@@ -416,8 +416,8 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp, | |||
416 | rdp->curtail = &rdp->curlist; | 416 | rdp->curtail = &rdp->curlist; |
417 | } | 417 | } |
418 | 418 | ||
419 | local_irq_disable(); | ||
420 | if (rdp->nxtlist && !rdp->curlist) { | 419 | if (rdp->nxtlist && !rdp->curlist) { |
420 | local_irq_disable(); | ||
421 | rdp->curlist = rdp->nxtlist; | 421 | rdp->curlist = rdp->nxtlist; |
422 | rdp->curtail = rdp->nxttail; | 422 | rdp->curtail = rdp->nxttail; |
423 | rdp->nxtlist = NULL; | 423 | rdp->nxtlist = NULL; |
@@ -442,9 +442,8 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp, | |||
442 | rcu_start_batch(rcp); | 442 | rcu_start_batch(rcp); |
443 | spin_unlock(&rcp->lock); | 443 | spin_unlock(&rcp->lock); |
444 | } | 444 | } |
445 | } else { | ||
446 | local_irq_enable(); | ||
447 | } | 445 | } |
446 | |||
448 | rcu_check_quiescent_state(rcp, rdp); | 447 | rcu_check_quiescent_state(rcp, rdp); |
449 | if (rdp->donelist) | 448 | if (rdp->donelist) |
450 | rcu_do_batch(rdp); | 449 | rcu_do_batch(rdp); |