Commit-ID: ef7b3e09ffdcd5200aea9523f6b56d331d1c4fc0 Gitweb: http://git.kernel.org/tip/ef7b3e09ffdcd5200aea9523f6b56d331d1c4fc0 Author: Robert Richter <robert.richter@xxxxxxx> AuthorDate: Wed, 29 Apr 2009 12:47:24 +0200 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Wed, 29 Apr 2009 14:51:14 +0200 perf_counter, x86: remove vendor check in fixed_mode_idx() The function fixed_mode_idx() is used generically. Now it checks the num_counters_fixed value instead of the vendor to decide if fixed counters are present. [ Impact: generalize code ] Signed-off-by: Robert Richter <robert.richter@xxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Acked-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> LKML-Reference: <1241002046-8832-28-git-send-email-robert.richter@xxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/x86/kernel/cpu/perf_counter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c index 4b8715b..d1c8036 100644 --- a/arch/x86/kernel/cpu/perf_counter.c +++ b/arch/x86/kernel/cpu/perf_counter.c @@ -542,7 +542,7 @@ fixed_mode_idx(struct perf_counter *counter, struct hw_perf_counter *hwc) { unsigned int event; - if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) + if (!x86_pmu.num_counters_fixed) return -1; if (unlikely(hwc->nmi)) -- 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