From dde9629af40411d7447b44c1e0f127adb2b9b9d5 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Wed, 30 Dec 2009 16:00:35 +0100
Subject: [PATCH] --- yaml --- r: 178695 b: refs/heads/master c:
 05cbaa2853cdfc255fdd04e65a82bfe9208c4e52 h: refs/heads/master i:   178693:
 ac4527606e1b6063b80b054c3f3f5d759a535594   178691:
 45d7bb9dd8f1440c181661f85ddf6946ae0802e9   178687:
 59a534c09e6bfc091b6e731a40c698964ea8e259 v: v3

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

diff --git a/[refs] b/[refs]
index 29bb337fbcb0..717902df301d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48b5ba9cc98d676712da29d9931f1c88e5185ff2
+refs/heads/master: 05cbaa2853cdfc255fdd04e65a82bfe9208c4e52
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 03cc061398d1..58ed1dae5875 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -5148,7 +5148,7 @@ int perf_event_init_task(struct task_struct *child)
 					    GFP_KERNEL);
 			if (!child_ctx) {
 				ret = -ENOMEM;
-				goto exit;
+				break;
 			}
 
 			__perf_event_init_context(child_ctx, child);
@@ -5164,7 +5164,7 @@ int perf_event_init_task(struct task_struct *child)
 		}
 	}
 
-	if (inherited_all) {
+	if (child_ctx && inherited_all) {
 		/*
 		 * Mark the child context as a clone of the parent
 		 * context, or of whatever the parent is a clone of.
@@ -5184,7 +5184,6 @@ int perf_event_init_task(struct task_struct *child)
 		get_ctx(child_ctx->parent_ctx);
 	}
 
-exit:
 	mutex_unlock(&parent_ctx->mutex);
 
 	perf_unpin_context(parent_ctx);