diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-12 22:17:37 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-12 22:17:37 +0800 |
| commit | 2f0de5192ae332ff270b2fc30594e4d67002d59b (patch) | |
| tree | 475fcbdaf94fdc1bc32c1527d448f702d5c18770 /kernel | |
| parent | bdcf7d8df4cfa7f99423da161019b964f7ce2520 (diff) | |
| parent | a057484ab40ff81f22a94bb62c035c78b5abd940 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/rcu/tree_plugin.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index 630c19772630..32cbe72bf545 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h @@ -2275,6 +2275,7 @@ static int rcu_nocb_kthread(void *arg) cl++; c++; local_bh_enable(); + cond_resched_rcu_qs(); list = next; } trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1); |