diff --git a/[refs] b/[refs] index 6843cbeacf45..04d932e2bea0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f41c013f553957765902fb01475972f0af3e8e7 +refs/heads/master: 00d1d0b095ba4e5c0958cb228b2a9c445d4a339d diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index 17ac47f4bce6..8d61d292f719 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -3036,7 +3036,7 @@ int perf_output_begin(struct perf_output_handle *handle, handle->sample = sample; if (!data->nr_pages) - goto fail; + goto out; have_lost = atomic_read(&data->lost); if (have_lost)