diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:19:54 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:19:54 +0200 |
| commit | a600ffe6ec609b0600ec590236f97f8d430e0984 (patch) | |
| tree | 57432877c74c80ab470d7b655a2e18a6b5168ee5 /kernel/trace/ring_buffer.c | |
| parent | d19031d32cd77b2878a006040e0f8e4183ca59ef (diff) | |
| parent | 23e542e5ba5e4298a1475f94750317ec1662ba21 (diff) | |
| download | linux-a600ffe6ec609b0600ec590236f97f8d430e0984.tar.bz2 | |
Merge branch 'for-4.20/google' into for-linus
Whisker device specific fixes to hid-google driver
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -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 1d92d4a982fd..65bd4616220d 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1546,6 +1546,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); |