diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-06-04 05:33:10 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-06-04 05:33:10 -0400 |
| commit | d8a382d2662822248a97ce9d670b90e68aefbd3a (patch) | |
| tree | 4f5bbd5d0a5881ed42de611402ea4ac2c6d6ff48 /arch/x86/oprofile | |
| parent | 45c34e05c4e3d36e7c44e790241ea11a1d90d54e (diff) | |
| parent | c6df8d5ab87a246942d138321e1721edbb69f6e1 (diff) | |
Merge remote branch 'tip/perf/urgent' into oprofile/urgent
Diffstat (limited to 'arch/x86/oprofile')
| -rw-r--r-- | arch/x86/oprofile/op_model_ppro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c index 1fd17cfb956b..d769cda54082 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c | |||
| @@ -238,11 +238,11 @@ static void arch_perfmon_setup_counters(void) | |||
| 238 | if (eax.split.version_id == 0 && current_cpu_data.x86 == 6 && | 238 | if (eax.split.version_id == 0 && current_cpu_data.x86 == 6 && |
| 239 | current_cpu_data.x86_model == 15) { | 239 | current_cpu_data.x86_model == 15) { |
| 240 | eax.split.version_id = 2; | 240 | eax.split.version_id = 2; |
| 241 | eax.split.num_events = 2; | 241 | eax.split.num_counters = 2; |
| 242 | eax.split.bit_width = 40; | 242 | eax.split.bit_width = 40; |
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | num_counters = eax.split.num_events; | 245 | num_counters = eax.split.num_counters; |
| 246 | 246 | ||
| 247 | op_arch_perfmon_spec.num_counters = num_counters; | 247 | op_arch_perfmon_spec.num_counters = num_counters; |
| 248 | op_arch_perfmon_spec.num_controls = num_counters; | 248 | op_arch_perfmon_spec.num_controls = num_counters; |