Commit-ID: ef4f30f54e265c2f6f9ac9eda4db158a4e16050b Gitweb: http://git.kernel.org/tip/ef4f30f54e265c2f6f9ac9eda4db158a4e16050b Author: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> AuthorDate: Tue, 18 May 2010 17:29:14 +0800 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Tue, 18 May 2010 12:05:20 +0200 perf, x86: P4 PMU -- fix typo in unflagged NMI handling Tested-by: Lin Ming <ming.m.lin@xxxxxxxxx> Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxx> LKML-Reference: <1274174954.22793.17.camel@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/x86/kernel/cpu/perf_event_p4.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c index 02f0728..87e1803 100644 --- a/arch/x86/kernel/cpu/perf_event_p4.c +++ b/arch/x86/kernel/cpu/perf_event_p4.c @@ -473,7 +473,7 @@ static inline int p4_pmu_clear_cccr_ovf(struct hw_perf_event *hwc) rdmsr(hwc->config_base + hwc->idx, low, high); /* we need to check high bit for unflagged overflows */ - if ((low & P4_CCCR_OVF) || (high & (1 << 31))) { + if ((low & P4_CCCR_OVF) || !(high & (1 << 31))) { overflow = 1; (void)checking_wrmsrl(hwc->config_base + hwc->idx, ((u64)low) & ~P4_CCCR_OVF); -- 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