lkml.org 
[lkml]   [2009]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/26] x86/oprofile: Fix usage of NUM_CONTROLS/NUM_COUNTERS macros
    Date
    Use the corresponding macros when iterating over counter and control
    registers. Since NUM_CONTROLS and NUM_COUNTERS are equal for AMD cpus
    the fix is more a cosmetical change.

    Signed-off-by: Robert Richter <robert.richter@amd.com>
    ---
    arch/x86/oprofile/op_model_amd.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
    index fdbed3a..dcfd450 100644
    --- a/arch/x86/oprofile/op_model_amd.c
    +++ b/arch/x86/oprofile/op_model_amd.c
    @@ -99,7 +99,7 @@ static void op_amd_fill_in_addresses(struct op_msrs * const msrs)

    #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
    for (i = 0; i < NUM_VIRT_COUNTERS; i++) {
    - int hw_counter = i % NUM_CONTROLS;
    + int hw_counter = i % NUM_COUNTERS;
    if (reserve_perfctr_nmi(MSR_K7_PERFCTR0 + i))
    msrs->multiplex[i].addr = MSR_K7_PERFCTR0 + hw_counter;
    else
    @@ -366,7 +366,7 @@ static void op_amd_shutdown(struct op_msrs const * const msrs)
    if (msrs->counters[i].addr)
    release_perfctr_nmi(MSR_K7_PERFCTR0 + i);
    }
    - for (i = 0; i < NUM_COUNTERS; ++i) {
    + for (i = 0; i < NUM_CONTROLS; ++i) {
    if (msrs->controls[i].addr)
    release_evntsel_nmi(MSR_K7_EVNTSEL0 + i);
    }
    --
    1.6.3.3



    \
     
     \ /
      Last update: 2009-07-28 19:27    [W:0.023 / U:61.676 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site