From 0556f613d648e8fd8f1431a772aa11324e74d630 Mon Sep 17 00:00:00 2001 From: Stephane Eranian Date: Tue, 24 Nov 2009 05:27:18 -0800 Subject: [PATCH] --- yaml --- r: 169779 b: refs/heads/master c: 1261a02a0c0ab8e643125705f0d1d83e5090e4d1 h: refs/heads/master i: 169777: a5232562134fb28bd187ffeabbb3404f699e1dd1 169775: c9dc392f17a4f7e568850f867c9ddb4727447cf9 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_event.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1ad371bca944..3f2cf61257a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcf1203a919c3a3d212c0ed01f5240fd592bf5ae +refs/heads/master: 1261a02a0c0ab8e643125705f0d1d83e5090e4d1 diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c index bd8743024204..c1bbed1021d9 100644 --- a/trunk/arch/x86/kernel/cpu/perf_event.c +++ b/trunk/arch/x86/kernel/cpu/perf_event.c @@ -2229,10 +2229,10 @@ validate_event(struct cpu_hw_events *cpuc, struct perf_event *event) { struct hw_perf_event fake_event = event->hw; - if (event->pmu != &pmu) + if (event->pmu && event->pmu != &pmu) return 0; - return x86_schedule_event(cpuc, &fake_event); + return x86_schedule_event(cpuc, &fake_event) >= 0; } static int validate_group(struct perf_event *event)