2 files changed, 5 insertions, 0 deletions

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index d35f26076ae5..1342f236e32a 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1632,6 +1632,7 @@ static void intel_pmu_drain_bts_buffer(struct cpu_hw_events *cpuc)
 
         data.period     = event->hw.last_period;
         data.addr       = 0;
+        data.raw        = NULL;
         regs.ip         = 0;
 
         /*
@@ -1749,6 +1750,7 @@ static int p6_pmu_handle_irq(struct pt_regs *regs)
         u64 val;
 
         data.addr = 0;
+        data.raw = NULL;
 
         cpuc = &__get_cpu_var(cpu_hw_events);
 
@@ -1794,6 +1796,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)
         u64 ack, status;
 
         data.addr = 0;
+        data.raw = NULL;
 
         cpuc = &__get_cpu_var(cpu_hw_events);
 
@@ -1857,6 +1860,7 @@ static int amd_pmu_handle_irq(struct pt_regs *regs)
         u64 val;
 
         data.addr = 0;
+        data.raw = NULL;
 
         cpuc = &__get_cpu_var(cpu_hw_events);
 
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 3a5d6c4786bb..d891ec4a8100 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4300,6 +4300,7 @@ void perf_bp_event(struct perf_event *bp, void *data)
         struct perf_sample_data sample;
         struct pt_regs *regs = data;
 
+        sample.raw = NULL;
         sample.addr = bp->attr.bp_addr;
 
         if (!perf_exclude_event(bp, regs))