diff options
author | David S. Miller <davem@davemloft.net> | 2009-09-28 17:37:12 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-28 17:37:12 -0700 |
commit | d29862f03575cdfa8819f78b0f3f78eec3b44629 (patch) | |
tree | 58bfb65f2b81ce16cc0896df86c7d2605703d54d | |
parent | a72a8a5f2ea32074e98803d4b15d0e093c5a9e4d (diff) | |
download | linux-stable-d29862f03575cdfa8819f78b0f3f78eec3b44629.tar.gz linux-stable-d29862f03575cdfa8819f78b0f3f78eec3b44629.tar.bz2 linux-stable-d29862f03575cdfa8819f78b0f3f78eec3b44629.zip |
sparc64: Minor coding style fixups in perf code.
These got introduced during the counter --> event tree-wide
renaming.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/kernel/perf_event.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c index 2b7743466ae4..03b041c4d95c 100644 --- a/arch/sparc/kernel/perf_event.c +++ b/arch/sparc/kernel/perf_event.c @@ -464,8 +464,7 @@ static u64 nop_for_index(int idx) sparc_pmu->lower_nop, idx); } -static inline void sparc_pmu_enable_event(struct hw_perf_event *hwc, - int idx) +static inline void sparc_pmu_enable_event(struct hw_perf_event *hwc, int idx) { u64 val, mask = mask_for_index(idx); @@ -473,8 +472,7 @@ static inline void sparc_pmu_enable_event(struct hw_perf_event *hwc, pcr_ops->write((val & ~mask) | hwc->config); } -static inline void sparc_pmu_disable_event(struct hw_perf_event *hwc, - int idx) +static inline void sparc_pmu_disable_event(struct hw_perf_event *hwc, int idx) { u64 mask = mask_for_index(idx); u64 nop = nop_for_index(idx); @@ -555,7 +553,7 @@ static void write_pmc(int idx, u64 val) } static int sparc_perf_event_set_period(struct perf_event *event, - struct hw_perf_event *hwc, int idx) + struct hw_perf_event *hwc, int idx) { s64 left = atomic64_read(&hwc->period_left); s64 period = hwc->sample_period; @@ -607,7 +605,7 @@ static int sparc_pmu_enable(struct perf_event *event) } static u64 sparc_perf_event_update(struct perf_event *event, - struct hw_perf_event *hwc, int idx) + struct hw_perf_event *hwc, int idx) { int shift = 64 - 32; u64 prev_raw_count, new_raw_count; @@ -939,7 +937,7 @@ void perf_event_print_debug(void) } static int __kprobes perf_event_nmi_handler(struct notifier_block *self, - unsigned long cmd, void *__args) + unsigned long cmd, void *__args) { struct die_args *args = __args; struct perf_sample_data data; |