From 7855bf0f3cc30d4e64445e8a7beaff359a24f147 Mon Sep 17 00:00:00 2001
From: Franck Bui-Huu <fbuihuu@gmail.com>
Date: Tue, 23 Nov 2010 16:21:44 +0100
Subject: [PATCH] --- yaml --- r: 223837 b: refs/heads/master c:
 2e939d1da9b5628642314c1e68b4319e61263c94 h: refs/heads/master i:   223835:
 f6337f5f959f997141ac33f05441b221ea29ed6d v: v3

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

diff --git a/[refs] b/[refs]
index cbc7f0718a73..cf0b99d350c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c7e550f13f8ad82efb6a5653ae628c2543c1768
+refs/heads/master: 2e939d1da9b5628642314c1e68b4319e61263c94
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 880698488c91..027c4d33b4d3 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -1073,7 +1073,7 @@ static int perf_event_refresh(struct perf_event *event, int refresh)
 	/*
 	 * not supported on inherited events
 	 */
-	if (event->attr.inherit)
+	if (event->attr.inherit || !is_sampling_event(event))
 		return -EINVAL;
 
 	atomic_add(refresh, &event->event_limit);