From 96f7e58e14f9ada69427cee9d67db338a7321b94 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 30 Mar 2009 19:07:09 +0200
Subject: [PATCH] --- yaml --- r: 147309 b: refs/heads/master c:
 9ea98e191255ee642e64a5745014424fc63f83b0 h: refs/heads/master i:   147307:
 eb64b7608bdbc76b40da55e927e6a3615ea899dd v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/kernel/cpu/perf_counter.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7d8a4ef8d53a..c576bbe27ab3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5d2bc0dd0379deddb9ede66fec90a3083eaec57
+refs/heads/master: 9ea98e191255ee642e64a5745014424fc63f83b0
diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c
index 7aab177fb566..b8885ccd8049 100644
--- a/trunk/arch/x86/kernel/cpu/perf_counter.c
+++ b/trunk/arch/x86/kernel/cpu/perf_counter.c
@@ -954,7 +954,7 @@ hw_perf_counter_init(struct perf_counter *counter)
 
 	err = __hw_perf_counter_init(counter);
 	if (err)
-		return NULL;
+		return ERR_PTR(err);
 
 	return &x86_perf_counter_ops;
 }