From db4282fb1f1e4621b5550fb2f07c114570c39848 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Fri, 12 Apr 2013 11:05:54 +0800
Subject: [PATCH] --- yaml --- r: 362521 b: refs/heads/master c:
 c481420248c6730246d2a1b1773d5d7007ae0835 h: refs/heads/master i:   362519:
 0f3885ff95e318cbea7f596dcd5b63313fcd5b94 v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/events/core.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 023b69d9fec4..a9dae6ba1569 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75761cc15877c155b3849b4e0e0cb3f897faf471
+refs/heads/master: c481420248c6730246d2a1b1773d5d7007ae0835
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
index 7f0d67ea3f48..7e0962ed7f8a 100644
--- a/trunk/kernel/events/core.c
+++ b/trunk/kernel/events/core.c
@@ -5987,6 +5987,7 @@ int perf_pmu_register(struct pmu *pmu, char *name, int type)
 	if (pmu->pmu_cpu_context)
 		goto got_cpu_context;
 
+	ret = -ENOMEM;
 	pmu->pmu_cpu_context = alloc_percpu(struct perf_cpu_context);
 	if (!pmu->pmu_cpu_context)
 		goto free_dev;