[tip:perf/urgent] perf_event: Return -EINVAL for Offcore Response Events

[tip-bot for Vince Weaver]

Commit-ID:  04bffb83d17c1b93578564f18e02b6cb1c385b40
Gitweb:     http://git.kernel.org/tip/04bffb83d17c1b93578564f18e02b6cb1c385b40
Author:     Vince Weaver <vweaver1@xxxxxxxxxxxx>
AuthorDate: Fri, 10 Jun 2011 16:07:52 -0400
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Fri, 1 Jul 2011 10:27:09 +0200

perf_event: Return -EINVAL for Offcore Response Events

Return a proper error code when denying raw access to Offcore Response
events. Right now we return "0" which gives tools the false impression
that opening the event worked.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/alpine.DEB.2.00.1106101606000.14542@xxxxxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 arch/x86/kernel/cpu/perf_event.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 3a0338b..c6bfa6b 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -598,7 +598,7 @@ static int x86_setup_perfctr(struct perf_event *event)
 	 * there's no sane user-space generalization yet:
 	 */
 	if (attr->type == PERF_TYPE_RAW)
-		return 0;
+		return -EINVAL;
 
 	if (attr->type == PERF_TYPE_HW_CACHE)
 		return set_ext_hw_attr(hwc, event);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/