From 7be0f58f1c6a761bf375f14b50856cc86456ceb9 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Mon, 2 Apr 2012 20:19:09 +0200 Subject: [PATCH] --- yaml --- r: 304885 b: refs/heads/master c: 7bf352384fda3f678a283928c6c5b2cd9da877e4 h: refs/heads/master i: 304883: 59b5abe6c0ea9f6689e7443bcd56227ddb73f4f2 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5100cadd2835..79bc08c65a89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd0d000b2c34aa43d4e92dcf0dfaeda7e123008a +refs/heads/master: 7bf352384fda3f678a283928c6c5b2cd9da877e4 diff --git a/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c index 2317228b5299..ebf169fe40ef 100644 --- a/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c +++ b/trunk/arch/x86/kernel/cpu/perf_event_amd_ibs.c @@ -468,6 +468,8 @@ static __init int perf_event_ibs_init(void) return -ENODEV; /* ibs not supported by the cpu */ perf_ibs_pmu_init(&perf_ibs_fetch, "ibs_fetch"); + if (ibs_caps & IBS_CAPS_OPCNT) + perf_ibs_op.config_mask |= IBS_OP_CNT_CTL; perf_ibs_pmu_init(&perf_ibs_op, "ibs_op"); register_nmi_handler(NMI_LOCAL, perf_ibs_nmi_handler, 0, "perf_ibs"); printk(KERN_INFO "perf: AMD IBS detected (0x%08x)\n", ibs_caps);