diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-08 15:08:27 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-08 15:08:27 -0800 |
| commit | 97b84c96505aa2b9c8772bbae68a4fa93da8c0f4 (patch) | |
| tree | dcd917c2b3821b5ec0fdf537f3df9e31cdc779e8 /kernel | |
| parent | 25cfd071169c6481405f5c2c4d91bc6dcd051800 (diff) | |
| parent | e5f84c1444ae59c85bd25ba05393c6bc87067ddb (diff) | |
Merge tag 'v4.4.37' into android-4.4.y
This is the 4.4.37 stable release
Change-Id: Ic6753a5a223abc02c4fe5205642d4f904de2e5b8
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); |