Skip to content

Commit

Permalink
sparc64: Minor coding style fixups in perf code.
Browse files Browse the repository at this point in the history
These got introduced during the counter --> event tree-wide
renaming.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Sep 29, 2009
1 parent a72a8a5 commit d29862f
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions arch/sparc/kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -464,17 +464,15 @@ 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);

val = pcr_ops->read();
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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit d29862f

Please sign in to comment.