diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-06-12 16:32:07 (GMT) |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2009-06-12 16:43:51 (GMT) |
| commit | 802070f5474af1a49435a9528aede47bb18abd47 (patch) | |
| tree | 802b4b85b068ff1c20e0c2580c838e835f0b7f1b /arch/x86/oprofile | |
| parent | 1241eb8f136bf3ea409f61590e7663465906d158 (diff) | |
| download | linux-fsl-qoriq-802070f5474af1a49435a9528aede47bb18abd47.tar.xz | |
x86/oprofile: fix initialization of arch_perfmon for core_i7
Commit:
e419294 x86/oprofile: moving arch_perfmon counter setup to op_x86_model_spec.init
introduced a bug in the initialization of core_i7 leading to the
incorrect model setup to &op_ppro_spec. This patch fixes this.
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/oprofile')
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 7826dfc..28ee490 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -406,6 +406,7 @@ module_param_call(cpu_type, force_cpu_type, NULL, NULL, 0); static int __init ppro_init(char **cpu_type) { __u8 cpu_model = boot_cpu_data.x86_model; + struct op_x86_model_spec const *spec = &op_ppro_spec; /* default */ if (force_arch_perfmon && cpu_has_arch_perfmon) return 0; @@ -432,7 +433,7 @@ static int __init ppro_init(char **cpu_type) *cpu_type = "i386/core_2"; break; case 26: - model = &op_arch_perfmon_spec; + spec = &op_arch_perfmon_spec; *cpu_type = "i386/core_i7"; break; case 28: @@ -443,7 +444,7 @@ static int __init ppro_init(char **cpu_type) return 0; } - model = &op_ppro_spec; + model = spec; return 1; } |