Skip to content

Commit

Permalink
perf_counter, x86: consistent use of type int for counter index
Browse files Browse the repository at this point in the history
The type of counter index is sometimes implemented as unsigned
int. This patch changes this to have a consistent usage of int.

[ Impact: cleanup ]

Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1241002046-8832-21-git-send-email-robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Robert Richter authored and Ingo Molnar committed Apr 29, 2009
1 parent 0953423 commit 6f00cad
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions arch/x86/kernel/cpu/perf_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/linux/perf_counter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6f00cad

Please sign in to comment.