diff --git a/[refs] b/[refs] index 2f02af4b0ac3..847f63236f29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93459c6cb9816c52200993d29dd18cea1daee335 +refs/heads/master: f2957f1f196b0217644a17c1379855a118a37d72 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index 0aeb3b93414e..f5427e0fc982 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -3542,7 +3542,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos, } r = ring_buffer_read_page(ref->buffer, &ref->page, - len, info->cpu, 0); + len, info->cpu, 1); if (r < 0) { ring_buffer_free_read_page(ref->buffer, ref->page);