Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc2ad4ba authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf, x86: Remove superfluous arguments to x86_perf_event_update() 



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: default avatarPeter 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: default avatarIngo Molnar <mingo@elte.hu>
parent 07088edb

arch/x86/kernel/cpu/perf_event.c

+6 −5
Original line number Diff line number Diff line
@@ -193,11 +193,12 @@ static u64 __read_mostly hw_cache_event_ids 
 * Returns the delta events processed.

 */

static u64

x86_perf_event_update(struct perf_event *event,

			struct hw_perf_event *hwc, int idx)

x86_perf_event_update(struct perf_event *event)

{

	struct hw_perf_event *hwc = &event->hw;

	int shift = 64 - x86_pmu.event_bits;

	u64 prev_raw_count, new_raw_count;

	int idx = hwc->idx;

	s64 delta;



	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

	 * that we are disabling:

	 */

	x86_perf_event_update(event, hwc, idx);

	x86_perf_event_update(event);



	cpuc->events[idx] = NULL;

}
@@ -1112,7 +1113,7 @@ static int x86_pmu_handle_irq(struct pt_regs *regs) 
		event = cpuc->events[idx];

		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)))

			continue;
@@ -1458,7 +1459,7 @@ void __init init_hw_perf_events(void) 


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 = {

arch/x86/kernel/cpu/perf_event_intel.c

+2 −8
Original line number Diff line number Diff line
@@ -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)

{

	struct hw_perf_event *hwc = &event->hw;

	int idx = hwc->idx;

	int ret;



	x86_perf_event_update(event, hwc, idx);

	ret = x86_perf_event_set_period(event);



	return ret;

	x86_perf_event_update(event);

	return x86_perf_event_set_period(event);

}



static void intel_pmu_reset(void)