lkml.org 
[lkml]   [2009]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/29] x86/perfcounters: consistent use of type int for counter index
    Date
    The type of counter index is sometimes implemented as unsigned
    int. This patch changes this to have a consistent usage of int.

    Signed-off-by: Robert Richter <robert.richter@amd.com>
    ---
    arch/x86/kernel/cpu/perf_counter.c | 8 ++++----
    include/linux/perf_counter.h | 2 +-
    2 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
    index f7fd4a3..d8beebe 100644
    --- a/arch/x86/kernel/cpu/perf_counter.c
    +++ b/arch/x86/kernel/cpu/perf_counter.c
    @@ -459,7 +459,7 @@ static void hw_perf_disable(int idx, u64 config)

    static inline void
    __pmc_fixed_disable(struct perf_counter *counter,
    - struct hw_perf_counter *hwc, unsigned int __idx)
    + struct hw_perf_counter *hwc, int __idx)
    {
    int idx = __idx - X86_PMC_IDX_FIXED;
    u64 ctrl_val, mask;
    @@ -474,7 +474,7 @@ __pmc_fixed_disable(struct perf_counter *counter,

    static inline void
    __x86_pmu_disable(struct perf_counter *counter,
    - struct hw_perf_counter *hwc, unsigned int idx)
    + struct hw_perf_counter *hwc, int idx)
    {
    if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL))
    __pmc_fixed_disable(counter, hwc, idx);
    @@ -523,7 +523,7 @@ x86_perf_counter_set_period(struct perf_counter *counter,

    static inline void
    __pmc_fixed_enable(struct perf_counter *counter,
    - struct hw_perf_counter *hwc, unsigned int __idx)
    + struct hw_perf_counter *hwc, int __idx)
    {
    int idx = __idx - X86_PMC_IDX_FIXED;
    u64 ctrl_val, bits, mask;
    @@ -691,7 +691,7 @@ static void x86_pmu_disable(struct perf_counter *counter)
    {
    struct cpu_hw_counters *cpuc = &__get_cpu_var(cpu_hw_counters);
    struct hw_perf_counter *hwc = &counter->hw;
    - unsigned int idx = hwc->idx;
    + int idx = hwc->idx;

    /*
    * Must be done before we disable, otherwise the nmi handler
    diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
    index c3db52d..41aed42 100644
    --- a/include/linux/perf_counter.h
    +++ b/include/linux/perf_counter.h
    @@ -318,7 +318,7 @@ struct hw_perf_counter {
    unsigned long config_base;
    unsigned long counter_base;
    int nmi;
    - unsigned int idx;
    + int idx;
    };
    union { /* software */
    atomic64_t count;
    --
    1.6.1.3



    \
     
     \ /
      Last update: 2009-04-29 13:01    [W:0.029 / U:94.632 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site