diff options
| author | Gary Bisson <gary.bisson@boundarydevices.com> | 2018-10-02 15:10:19 +0200 |
|---|---|---|
| committer | Gary Bisson <gary.bisson@boundarydevices.com> | 2018-10-02 15:10:19 +0200 |
| commit | c98b0c5db65001d10d7f0af026801b9c193c369e (patch) | |
| tree | f10a85be5659f9b2f8f3ca4aff41d8fd3aa01b37 /kernel/trace | |
| parent | cc9333d7aace5c1de4e81932870b53bb6614dedd (diff) | |
| parent | 46f9f7c3c326389d5765c28f120fead6cc068e67 (diff) | |
Merge tag 'v4.9.130' into 4.9-2.3.x-imx
This is the 4.9.130 stable release
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index dc29b600d2cb..f316e90ad538 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1504,6 +1504,8 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages) tmp_iter_page = first_page; do { + cond_resched(); + to_remove_page = tmp_iter_page; rb_inc_page(cpu_buffer, &tmp_iter_page); |