aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-09-28 20:37:12 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-28 20:37:12 -0400
commitd29862f03575cdfa8819f78b0f3f78eec3b44629 (patch)
tree58bfb65f2b81ce16cc0896df86c7d2605703d54d /arch/sparc/kernel
parenta72a8a5f2ea32074e98803d4b15d0e093c5a9e4d (diff)
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>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r--arch/sparc/kernel/perf_event.c12
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)
464 sparc_pmu->lower_nop, idx); 464 sparc_pmu->lower_nop, idx);
465} 465}
466 466
467static inline void sparc_pmu_enable_event(struct hw_perf_event *hwc, 467static inline void sparc_pmu_enable_event(struct hw_perf_event *hwc, int idx)
468 int idx)
469{ 468{
470 u64 val, mask = mask_for_index(idx); 469 u64 val, mask = mask_for_index(idx);
471 470
@@ -473,8 +472,7 @@ static inline void sparc_pmu_enable_event(struct hw_perf_event *hwc,
473 pcr_ops->write((val & ~mask) | hwc->config); 472 pcr_ops->write((val & ~mask) | hwc->config);
474} 473}
475 474
476static inline void sparc_pmu_disable_event(struct hw_perf_event *hwc, 475static inline void sparc_pmu_disable_event(struct hw_perf_event *hwc, int idx)
477 int idx)
478{ 476{
479 u64 mask = mask_for_index(idx); 477 u64 mask = mask_for_index(idx);
480 u64 nop = nop_for_index(idx); 478 u64 nop = nop_for_index(idx);
@@ -555,7 +553,7 @@ static void write_pmc(int idx, u64 val)
555} 553}
556 554
557static int sparc_perf_event_set_period(struct perf_event *event, 555static int sparc_perf_event_set_period(struct perf_event *event,
558 struct hw_perf_event *hwc, int idx) 556 struct hw_perf_event *hwc, int idx)
559{ 557{
560 s64 left = atomic64_read(&hwc->period_left); 558 s64 left = atomic64_read(&hwc->period_left);
561 s64 period = hwc->sample_period; 559 s64 period = hwc->sample_period;
@@ -607,7 +605,7 @@ static int sparc_pmu_enable(struct perf_event *event)
607} 605}
608 606
609static u64 sparc_perf_event_update(struct perf_event *event, 607static u64 sparc_perf_event_update(struct perf_event *event,
610 struct hw_perf_event *hwc, int idx) 608 struct hw_perf_event *hwc, int idx)
611{ 609{
612 int shift = 64 - 32; 610 int shift = 64 - 32;
613 u64 prev_raw_count, new_raw_count; 611 u64 prev_raw_count, new_raw_count;
@@ -939,7 +937,7 @@ void perf_event_print_debug(void)
939} 937}
940 938
941static int __kprobes perf_event_nmi_handler(struct notifier_block *self, 939static int __kprobes perf_event_nmi_handler(struct notifier_block *self,
942 unsigned long cmd, void *__args) 940 unsigned long cmd, void *__args)
943{ 941{
944 struct die_args *args = __args; 942 struct die_args *args = __args;
945 struct perf_sample_data data; 943 struct perf_sample_data data;