GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 00:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf, x86: Remove superfluous arguments to x86_perf_event_update()

Browse source 
The second and third argument to x86_perf_event_update() are superfluous
since they are simple expressions of the first argument. Hence remove
them.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: paulus@samba.org
Cc: eranian@google.com
Cc: robert.richter@amd.com
Cc: fweisbec@gmail.com
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
LKML-Reference: <20100304140100.089468871@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2010-03-02 20:18:39 +01:00 • committed by Ingo Molnar
parent 07088edb88
commit cc2ad4ba87
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
arch/x86/kernel/cpu/perf_event.c
View file

@ -193,11 +193,12 @@ static u64 __read_mostly hw_cache_event_ids
* Returns the delta events processed. * Returns the delta events processed.
*/ */
static u64 static u64
x86_perf_event_update(struct perf_event *event, x86_perf_event_update(struct perf_event *event)
struct hw_perf_event *hwc, int idx)
{ {
struct hw_perf_event *hwc = &event->hw;
int shift = 64 - x86_pmu.event_bits; int shift = 64 - x86_pmu.event_bits;
u64 prev_raw_count, new_raw_count; u64 prev_raw_count, new_raw_count;
int idx = hwc->idx;
s64 delta; s64 delta;
if (idx == X86_PMC_IDX_FIXED_BTS) if (idx == X86_PMC_IDX_FIXED_BTS)
@ -1064,7 +1065,7 @@ static void x86_pmu_stop(struct perf_event *event)
* Drain the remaining delta count out of a event * Drain the remaining delta count out of a event
* that we are disabling: * that we are disabling:
*/ */
x86_perf_event_update(event, hwc, idx); x86_perf_event_update(event);
cpuc->events[idx] = NULL; cpuc->events[idx] = NULL;
} }
@ -1112,7 +1113,7 @@ static int x86_pmu_handle_irq(struct pt_regs *regs)
event = cpuc->events[idx]; event = cpuc->events[idx];
hwc = &event->hw; hwc = &event->hw;
val = x86_perf_event_update(event, hwc, idx); val = x86_perf_event_update(event);
if (val & (1ULL << (x86_pmu.event_bits - 1))) if (val & (1ULL << (x86_pmu.event_bits - 1)))
continue; continue;
@ -1458,7 +1459,7 @@ void __init init_hw_perf_events(void)
static inline void x86_pmu_read(struct perf_event *event) static inline void x86_pmu_read(struct perf_event *event)
{ {
x86_perf_event_update(event, &event->hw, event->hw.idx); x86_perf_event_update(event);
} }
static const struct pmu pmu = { static const struct pmu pmu = {

10
arch/x86/kernel/cpu/perf_event_intel.c
View file

@ -694,14 +694,8 @@ static void intel_pmu_enable_event(struct hw_perf_event *hwc, int idx)
*/ */
static int intel_pmu_save_and_restart(struct perf_event *event) static int intel_pmu_save_and_restart(struct perf_event *event)
{ {
struct hw_perf_event *hwc = &event->hw; x86_perf_event_update(event);
int idx = hwc->idx; return x86_perf_event_set_period(event);
int ret;
x86_perf_event_update(event, hwc, idx);
ret = x86_perf_event_set_period(event);
return ret;
} }
static void intel_pmu_reset(void) static void intel_pmu_reset(void)