From 9d5a2aaae01732476b348f0286ae57067547f03e Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Thu, 13 Sep 2012 14:59:14 -0600
Subject: [PATCH] --- yaml --- r: 334653 b: refs/heads/master c:
 20b279ddb38ca42f8863cec07b4d45ec24589f13 h: refs/heads/master i:   334651:
 37a9d9d7dd2ebe55405bb6d3f734af5148c2e1d2 v: v3

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

diff --git a/[refs] b/[refs]
index aba7ec1720e7..c87d509f1ee5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1342798cc13e3b48d9b5738f0c8fa812ccea8101
+refs/heads/master: 20b279ddb38ca42f8863cec07b4d45ec24589f13
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
index 915b876edd1e..3373f84d1397 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -338,6 +338,9 @@ int x86_setup_perfctr(struct perf_event *event)
 		/* BTS is currently only allowed for user-mode. */
 		if (!attr->exclude_kernel)
 			return -EOPNOTSUPP;
+
+		if (!attr->exclude_guest)
+			return -EOPNOTSUPP;
 	}
 
 	hwc->config |= config;
@@ -380,6 +383,9 @@ int x86_pmu_hw_config(struct perf_event *event)
 	if (event->attr.precise_ip) {
 		int precise = 0;
 
+		if (!event->attr.exclude_guest)
+			return -EOPNOTSUPP;
+
 		/* Support for constant skid */
 		if (x86_pmu.pebs_active && !x86_pmu.pebs_broken) {
 			precise++;