diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-25 05:04:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-25 05:04:51 -0400 |
| commit | 10c9850cb2ced2ce528e5b692c639974213a64ec (patch) | |
| tree | f8063beac0ba1dab069d25661845c5b7ef9a67c7 /kernel/trace/ring_buffer_benchmark.c | |
| parent | 0c2364791343e4b04cd1f097ff2abc2799062448 (diff) | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/ring_buffer_benchmark.c')
| -rw-r--r-- | kernel/trace/ring_buffer_benchmark.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer_benchmark.c b/kernel/trace/ring_buffer_benchmark.c index 9fbcaf567886..68ee79afe31c 100644 --- a/kernel/trace/ring_buffer_benchmark.c +++ b/kernel/trace/ring_buffer_benchmark.c | |||
| @@ -113,7 +113,7 @@ static enum event_status read_page(int cpu) | |||
| 113 | int i; | 113 | int i; |
| 114 | 114 | ||
| 115 | bpage = ring_buffer_alloc_read_page(buffer, cpu); | 115 | bpage = ring_buffer_alloc_read_page(buffer, cpu); |
| 116 | if (!bpage) | 116 | if (IS_ERR(bpage)) |
| 117 | return EVENT_DROPPED; | 117 | return EVENT_DROPPED; |
| 118 | 118 | ||
| 119 | ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1); | 119 | ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1); |