Commit 5e855db5 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Ingo Molnar
Browse files

perf_event: Fix variable initialization in other codepaths 



Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <4B20BAA6.7010609@cn.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 79312416

arch/x86/kernel/cpu/perf_event.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -1632,6 +1632,7 @@ static void intel_pmu_drain_bts_buffer(struct cpu_hw_events *cpuc) 




	data.period	= event->hw.last_period;

	data.period	= event->hw.last_period;

	data.addr	= 0;

	data.addr	= 0;

	data.raw	= NULL;

	regs.ip		= 0;

	regs.ip		= 0;





	/*

	/*
@@ -1749,6 +1750,7 @@ static int p6_pmu_handle_irq(struct pt_regs *regs) 
	u64 val;

	u64 val;





	data.addr = 0;

	data.addr = 0;

	data.raw = NULL;





	cpuc = &__get_cpu_var(cpu_hw_events);

	cpuc = &__get_cpu_var(cpu_hw_events);
@@ -1794,6 +1796,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs) 
	u64 ack, status;

	u64 ack, status;





	data.addr = 0;

	data.addr = 0;

	data.raw = NULL;





	cpuc = &__get_cpu_var(cpu_hw_events);

	cpuc = &__get_cpu_var(cpu_hw_events);
@@ -1857,6 +1860,7 @@ static int amd_pmu_handle_irq(struct pt_regs *regs) 
	u64 val;

	u64 val;





	data.addr = 0;

	data.addr = 0;

	data.raw = NULL;





	cpuc = &__get_cpu_var(cpu_hw_events);

	cpuc = &__get_cpu_var(cpu_hw_events);

kernel/perf_event.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -4300,6 +4300,7 @@ void perf_bp_event(struct perf_event *bp, void *data) 
	struct perf_sample_data sample;

	struct perf_sample_data sample;

	struct pt_regs *regs = data;

	struct pt_regs *regs = data;





	sample.raw = NULL;

	sample.addr = bp->attr.bp_addr;

	sample.addr = bp->attr.bp_addr;





	if (!perf_exclude_event(bp, regs))

	if (!perf_exclude_event(bp, regs))

CRA Git | Maintained and supported by SUSTech CRA and CCSE