diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-25 11:01:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-25 11:01:05 +0200 |
| commit | 290d9bf2811bd83ae907232176d75690c0f7d82b (patch) | |
| tree | a3b72364248c4bc1b2bf6ed1958ea4e6d6a1564e /kernel/trace/ring_buffer_benchmark.c | |
| parent | c7f4f994dea2e6a513e63f063f6c92202b7c1f3f (diff) | |
| parent | 64aee2a965cf2954a038b5522f11d2cd2f0f8f3e (diff) | |
Merge branch 'perf/urgent' into perf/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) int i; bpage = ring_buffer_alloc_read_page(buffer, cpu); - if (!bpage) + if (IS_ERR(bpage)) return EVENT_DROPPED; ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1); |