From be6a22b5cb422e34f494861594c8fd5d7278c3b4 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 14 Nov 2011 10:03:25 +0100
Subject: [PATCH] --- yaml --- r: 276383 b: refs/heads/master c:
 ed13ec58bfe0d5dc95f748e6118432cb0fa283cb h: refs/heads/master i:   276381:
 3f2754803849e644cc31e4755c25585d16370ede   276379:
 fe089a22c40a4f753d9f72191e31b48c929b7c3f   276375:
 cc03dc218f3c2d1f82ac4c383e62a06617330760   276367:
 d160019213b3b0bf3a0b85975af65df11e483c33   276351:
 95f01ca704fa6d750e105340195aa0fc79084027 v: v3

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

diff --git a/[refs] b/[refs]
index 5c13b556c844..0a7fedd2d4f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa2bc1ade59003a379ffc485d6da2d92ea3370a6
+refs/heads/master: ed13ec58bfe0d5dc95f748e6118432cb0fa283cb
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
index ff0e8d498750..2bda212a0010 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -312,12 +312,8 @@ int x86_setup_perfctr(struct perf_event *event)
 			return -EOPNOTSUPP;
 	}
 
-	/*
-	 * Do not allow config1 (extended registers) to propagate,
-	 * there's no sane user-space generalization yet:
-	 */
 	if (attr->type == PERF_TYPE_RAW)
-		return 0;
+		return x86_pmu_extra_regs(event->attr.config, event);
 
 	if (attr->type == PERF_TYPE_HW_CACHE)
 		return set_ext_hw_attr(hwc, event);