---

yaml --- r: 223837 b: refs/heads/master c: 2e939d1 h: refs/heads/master i: 223835: f6337f5 v: v3
git-mirror · Nov 26, 2010 · 7855bf0 · 7855bf0
1 parent 6d8e85f
commit 7855bf0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);