diff options
| author | Avi Kivity <avi@redhat.com> | 2010-04-19 12:52:53 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-17 12:17:58 +0300 |
| commit | 9beeaa2d689842f7760aa16c512e6bb8182d38b6 (patch) | |
| tree | 62cea0772127c4b1c0b476e46dec6830d36809c1 /arch/x86/oprofile/op_model_ppro.c | |
| parent | 3246af0ece6c61689847417977733f0b12dc4b6f (diff) | |
| parent | a1645ce12adb6c9cc9e19d7695466204e3f017fe (diff) | |
| download | op-kernel-dev-9beeaa2d689842f7760aa16c512e6bb8182d38b6.zip op-kernel-dev-9beeaa2d689842f7760aa16c512e6bb8182d38b6.tar.gz | |
Merge branch 'perf'
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/oprofile/op_model_ppro.c')
| -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 2bf90fa..c8abc4d 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c @@ -239,11 +239,11 @@ static void arch_perfmon_setup_counters(void) if (eax.split.version_id == 0 && current_cpu_data.x86 == 6 && current_cpu_data.x86_model == 15) { eax.split.version_id = 2; - eax.split.num_events = 2; + eax.split.num_counters = 2; eax.split.bit_width = 40; } - num_counters = eax.split.num_events; + num_counters = eax.split.num_counters; op_arch_perfmon_spec.num_counters = num_counters; op_arch_perfmon_spec.num_controls = num_counters; |
