diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-05-25 11:38:19 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2009-06-11 13:42:17 -0400 |
| commit | bbc5986d2db427fdd61b6116ff8b9ed988e663a8 (patch) | |
| tree | db39521e332170b30b3c6d83cf13ad5911256344 /arch/x86/oprofile/op_model_amd.c | |
| parent | 217d3cfb959756cb493fc03106c0253baa420ce8 (diff) | |
x86/oprofile: use 64 bit wrmsr functions
This patch replaces some wrmsr() functions with wrmsrl().
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/oprofile/op_model_amd.c')
| -rw-r--r-- | arch/x86/oprofile/op_model_amd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c index c5c5eec2fa74..9bf901762411 100644 --- a/arch/x86/oprofile/op_model_amd.c +++ b/arch/x86/oprofile/op_model_amd.c | |||
| @@ -101,14 +101,15 @@ static void op_amd_setup_ctrs(struct op_x86_model_spec const *model, | |||
| 101 | for (i = 0; i < NUM_COUNTERS; ++i) { | 101 | for (i = 0; i < NUM_COUNTERS; ++i) { |
| 102 | if (unlikely(!msrs->counters[i].addr)) | 102 | if (unlikely(!msrs->counters[i].addr)) |
| 103 | continue; | 103 | continue; |
| 104 | wrmsr(msrs->counters[i].addr, -1, -1); | 104 | wrmsrl(msrs->counters[i].addr, -1LL); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | /* enable active counters */ | 107 | /* enable active counters */ |
| 108 | for (i = 0; i < NUM_COUNTERS; ++i) { | 108 | for (i = 0; i < NUM_COUNTERS; ++i) { |
| 109 | if (counter_config[i].enabled && msrs->counters[i].addr) { | 109 | if (counter_config[i].enabled && msrs->counters[i].addr) { |
| 110 | reset_value[i] = counter_config[i].count; | 110 | reset_value[i] = counter_config[i].count; |
| 111 | wrmsr(msrs->counters[i].addr, -(unsigned int)counter_config[i].count, -1); | 111 | wrmsrl(msrs->counters[i].addr, |
| 112 | -(s64)counter_config[i].count); | ||
| 112 | rdmsrl(msrs->controls[i].addr, val); | 113 | rdmsrl(msrs->controls[i].addr, val); |
| 113 | val &= model->reserved; | 114 | val &= model->reserved; |
| 114 | val |= op_x86_get_ctrl(model, &counter_config[i]); | 115 | val |= op_x86_get_ctrl(model, &counter_config[i]); |
| @@ -251,7 +252,7 @@ static int op_amd_check_ctrs(struct pt_regs * const regs, | |||
| 251 | if (val & OP_CTR_OVERFLOW) | 252 | if (val & OP_CTR_OVERFLOW) |
| 252 | continue; | 253 | continue; |
| 253 | oprofile_add_sample(regs, i); | 254 | oprofile_add_sample(regs, i); |
| 254 | wrmsr(msrs->counters[i].addr, -(unsigned int)reset_value[i], -1); | 255 | wrmsrl(msrs->counters[i].addr, -(s64)reset_value[i]); |
| 255 | } | 256 | } |
| 256 | 257 | ||
| 257 | op_amd_handle_ibs(regs, msrs); | 258 | op_amd_handle_ibs(regs, msrs); |