perf_counter, x86: remove vendor check in fixed_mode_idx()
authorRobert Richter <robert.richter@amd.com>
Wed, 29 Apr 2009 10:47:24 +0000 (12:47 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 29 Apr 2009 12:51:14 +0000 (14:51 +0200)
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>
arch/x86/kernel/cpu/perf_counter.c

index 4b8715b34f87911a7618f58c109fec9322ea71b7..d1c8036dcbd66db1b5c687d925c5a535c75ad3b5 100644 (file)
@@ -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))