diff options
| author | Robert Richter | 2008-10-12 21:12:34 +0200 |
|---|---|---|
| committer | Robert Richter | 2009-06-10 22:09:24 +0200 |
| commit | e419294ed3c98cccc145202e4fe165bfd8099d63 (patch) | |
| tree | 24eced48e81cc31765ac1a3a87eb75bed583e1fc /arch/x86/oprofile/nmi_int.c | |
| parent | Revert "oprofile: discover counters for op ppro too" (diff) | |
| download | kernel-qcow2-linux-e419294ed3c98cccc145202e4fe165bfd8099d63.tar.gz kernel-qcow2-linux-e419294ed3c98cccc145202e4fe165bfd8099d63.tar.xz kernel-qcow2-linux-e419294ed3c98cccc145202e4fe165bfd8099d63.zip | |
x86/oprofile: moving arch_perfmon counter setup to op_x86_model_spec.init
The function arch_perfmon_init() in nmi_int.c is model specific. This
patch moves it to op_model_ppro.c by using the init function pointer
in struct op_x86_model_spec.
Cc: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/oprofile/nmi_int.c')
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 3b285e656e27..dd8515301fbf 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -427,7 +427,7 @@ static int __init ppro_init(char **cpu_type) *cpu_type = "i386/core_2"; break; case 26: - arch_perfmon_setup_counters(); + model = &op_arch_perfmon_spec; *cpu_type = "i386/core_i7"; break; case 28: @@ -442,16 +442,6 @@ static int __init ppro_init(char **cpu_type) return 1; } -static int __init arch_perfmon_init(char **cpu_type) -{ - if (!cpu_has_arch_perfmon) - return 0; - *cpu_type = "i386/arch_perfmon"; - model = &op_arch_perfmon_spec; - arch_perfmon_setup_counters(); - return 1; -} - /* in order to get sysfs right */ static int using_nmi; @@ -509,8 +499,15 @@ int __init op_nmi_init(struct oprofile_operations *ops) break; } - if (!cpu_type && !arch_perfmon_init(&cpu_type)) + if (cpu_type) + break; + + if (!cpu_has_arch_perfmon) return -ENODEV; + + /* use arch perfmon as fallback */ + cpu_type = "i386/arch_perfmon"; + model = &op_arch_perfmon_spec; break; default: |