lkml.org 
[lkml]   [2009]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/23] Revert "oprofile: discover counters for op ppro too"
    Date
    This reverts commit 59512900baab03c5629f2ff5efad1d5d4e682ece.

    arch_perfmon_setup_counters() is actually never called for ppro, so
    there is no code that changes the numbers in op_ppro_spec. The patch
    as it is has no effect.

    Cc: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Robert Richter <robert.richter@amd.com>
    ---
    arch/x86/oprofile/op_model_ppro.c | 8 +++-----
    arch/x86/oprofile/op_x86_model.h | 2 +-
    2 files changed, 4 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
    index 10131fb..2a12399 100644
    --- a/arch/x86/oprofile/op_model_ppro.c
    +++ b/arch/x86/oprofile/op_model_ppro.c
    @@ -213,9 +213,9 @@ static void ppro_shutdown(struct op_msrs const * const msrs)
    }


    -struct op_x86_model_spec op_ppro_spec = {
    - .num_counters = 2, /* can be overriden */
    - .num_controls = 2, /* dito */
    +struct op_x86_model_spec const op_ppro_spec = {
    + .num_counters = 2,
    + .num_controls = 2,
    .fill_in_addresses = &ppro_fill_in_addresses,
    .setup_ctrs = &ppro_setup_ctrs,
    .check_ctrs = &ppro_check_ctrs,
    @@ -251,8 +251,6 @@ void arch_perfmon_setup_counters(void)

    op_arch_perfmon_spec.num_counters = num_counters;
    op_arch_perfmon_spec.num_controls = num_counters;
    - op_ppro_spec.num_counters = num_counters;
    - op_ppro_spec.num_controls = num_counters;
    }

    struct op_x86_model_spec op_arch_perfmon_spec = {
    diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
    index 825e790..2317149 100644
    --- a/arch/x86/oprofile/op_x86_model.h
    +++ b/arch/x86/oprofile/op_x86_model.h
    @@ -45,7 +45,7 @@ struct op_x86_model_spec {
    void (*shutdown)(struct op_msrs const * const msrs);
    };

    -extern struct op_x86_model_spec op_ppro_spec;
    +extern struct op_x86_model_spec const op_ppro_spec;
    extern struct op_x86_model_spec const op_p4_spec;
    extern struct op_x86_model_spec const op_p4_ht2_spec;
    extern struct op_x86_model_spec const op_amd_spec;
    --
    1.6.3.1



    \
     
     \ /
      Last update: 2009-06-12 15:05    [W:0.033 / U:0.532 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site