From 2f1630073ef07c0ab1a91cd2093ebbb76b8148d6 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Tue, 16 Mar 2010 17:07:33 +0100
Subject: [PATCH] --- yaml --- r: 191096 b: refs/heads/master c:
 984763cb90d4b5444baa0c3e43feff7926bf1834 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 695304930953..6188feb14999 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cc718b9dad682329a60e73547c6e708faa5bbe4
+refs/heads/master: 984763cb90d4b5444baa0c3e43feff7926bf1834
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
index 0d3466cf7f57..5dacf63f913e 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -472,8 +472,9 @@ static int __hw_perf_event_init(struct perf_event *event)
 	hwc->last_tag = ~0ULL;
 
 	/* Processor specifics */
-	if (x86_pmu.hw_config(attr, hwc))
-		return -EOPNOTSUPP;
+	err = x86_pmu.hw_config(attr, hwc);
+	if (err)
+		return err;
 
 	if (!hwc->sample_period) {
 		hwc->sample_period = x86_pmu.max_period;