From b7f6ca0e0be7e4d3451ec053cc8edb05969a6e43 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Sat, 6 Mar 2010 13:48:54 +0100 Subject: [PATCH] --- yaml --- r: 191063 b: refs/heads/master c: 2df202bf7520eaffcbfb07e45dfa3cfb0aeee2c0 h: refs/heads/master i: 191061: 36891a67b5d199dc79c3543927670ca37abca681 191059: a4cfcd7cce65addecc70db2f194d5a208ae39604 191055: 6a4f288cf52ab35a1385234dd46b239a50c71f05 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_event_intel_lbr.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f55eef0c46a9..a7c451dd0ccf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4807e3d5dc7bb7057dd6ca3abb09f3da2eb8c323 +refs/heads/master: 2df202bf7520eaffcbfb07e45dfa3cfb0aeee2c0 diff --git a/trunk/arch/x86/kernel/cpu/perf_event_intel_lbr.c b/trunk/arch/x86/kernel/cpu/perf_event_intel_lbr.c index dcec765f8188..0145f99f7a35 100644 --- a/trunk/arch/x86/kernel/cpu/perf_event_intel_lbr.c +++ b/trunk/arch/x86/kernel/cpu/perf_event_intel_lbr.c @@ -69,7 +69,7 @@ static void intel_pmu_lbr_enable(struct perf_event *event) if (!x86_pmu.lbr_nr) return; - WARN_ON(cpuc->enabled); + WARN_ON_ONCE(cpuc->enabled); /* * Reset the LBR stack if this is the first LBR user or @@ -93,9 +93,10 @@ static void intel_pmu_lbr_disable(struct perf_event *event) return; cpuc->lbr_users--; - BUG_ON(cpuc->lbr_users < 0); - WARN_ON(cpuc->enabled); + + if (cpuc->enabled && !cpuc->lbr_users) + __intel_pmu_lbr_disable(); } static void intel_pmu_lbr_enable_all(void)