diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-04-29 06:47:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:51:14 -0400 |
| commit | ef7b3e09ffdcd5200aea9523f6b56d331d1c4fc0 (patch) | |
| tree | 8e1516bf3e1f5704ad1103ab53971b6d9340550f /arch | |
| parent | c619b8ffb1cec6a431687a35695dc6fd292a79e6 (diff) | |
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@amd.com>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1241002046-8832-28-git-send-email-robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | 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 4b8715b34f87..d1c8036dcbd6 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) | |||
| 542 | { | 542 | { |
| 543 | unsigned int event; | 543 | unsigned int event; |
| 544 | 544 | ||
| 545 | if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) | 545 | if (!x86_pmu.num_counters_fixed) |
| 546 | return -1; | 546 | return -1; |
| 547 | 547 | ||
| 548 | if (unlikely(hwc->nmi)) | 548 | if (unlikely(hwc->nmi)) |