From e3bd96b5d718bcdaa02000ffdb9fb46463d55780 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Thu, 21 Apr 2011 11:03:20 -0400
Subject: [PATCH] --- yaml --- r: 245437 b: refs/heads/master c:
 103b3934817a7c42fba6e1ef76ecb390a2837d40 h: refs/heads/master i:   245435:
 5aa9966c0d976410e2c8b26a7c437f2ae26e5660 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/x86/kernel/cpu/perf_event_p4.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2b9c33ebf308..ff023598a209 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eff430de53be6f3328c3eebe93755f1ecf499e37
+refs/heads/master: 103b3934817a7c42fba6e1ef76ecb390a2837d40
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_p4.c b/trunk/arch/x86/kernel/cpu/perf_event_p4.c
index 8ff882fdb1c0..ae31e9698d92 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event_p4.c
@@ -912,8 +912,7 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)
 	int idx, handled = 0;
 	u64 val;
 
-	data.addr = 0;
-	data.raw = NULL;
+	perf_sample_data_init(&data, 0);
 
 	cpuc = &__get_cpu_var(cpu_hw_events);