Commit-ID: 2e939d1da9b5628642314c1e68b4319e61263c94 Gitweb: http://git.kernel.org/tip/2e939d1da9b5628642314c1e68b4319e61263c94 Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx> AuthorDate: Tue, 23 Nov 2010 16:21:44 +0100 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Fri, 26 Nov 2010 15:14:55 +0100 perf: Limit event refresh to sampling event Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx> Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> LKML-Reference: <1290525705-6265-2-git-send-email-fbuihuu@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- kernel/perf_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 8806984..027c4d3 100644 --- a/kernel/perf_event.c +++ b/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); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|