---

yaml --- r: 191096 b: refs/heads/master c: 984763c h: refs/heads/master v: v3
git-mirror · Mar 17, 2010 · 2f16300 · 2f16300
1 parent ebb50ef
commit 2f16300
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;