From 4ae59854124f560acf33ecec06be2d04e276e87d Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Wed, 4 Jul 2012 18:15:42 +0100
Subject: [PATCH] --- yaml --- r: 311722 b: refs/heads/master c:
 fdeb8e35fd59e79dec385f98eb4b6d2e3398264b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cabd087aec70..fbb3543353bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 433e2f307beff8adba241646ce9108544e0c5a03
+refs/heads/master: fdeb8e35fd59e79dec385f98eb4b6d2e3398264b
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index 186c8cb982c5..a02eada3aa5d 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -503,7 +503,7 @@ __hw_perf_event_init(struct perf_event *event)
 	     event_requires_mode_exclusion(&event->attr)) {
 		pr_debug("ARM performance counters do not support "
 			 "mode exclusion\n");
-		return -EPERM;
+		return -EOPNOTSUPP;
 	}
 
 	/*