From b8e63aea320fa5f27742d27dc57f3e869a922e8f Mon Sep 17 00:00:00 2001
From: Stephane Eranian <eranian@google.com>
Date: Mon, 17 May 2010 12:46:01 +0200
Subject: [PATCH] --- yaml --- r: 199091 b: refs/heads/master c:
 00d1d0b095ba4e5c0958cb228b2a9c445d4a339d h: refs/heads/master i:   199089:
 8dae11c113c83b6c40351e0cf1c289c837758093   199087:
 aae160382b60a22970b2e8919d444b94d9a142de v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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)