---

yaml --- r: 169745 b: refs/heads/master c: a4234bf h: refs/heads/master i: 169743: c81cc14 v: v3
git-mirror · Nov 23, 2009 · 4a8c1ed · 4a8c1ed
1 parent e1bc28b
commit 4a8c1ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e3d8330ae2c4b2c11a9577a0130d2ecda1c610d
+refs/heads/master: a4234bfcf4d72a10a99176cdef007345e9c3b4aa
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -3954,12 +3954,12 @@ static void do_perf_sw_event(enum perf_type_id type, u32 event_id,
 void __perf_sw_event(u32 event_id, u64 nr, int nmi,
 			    struct pt_regs *regs, u64 addr)
 {
-	struct perf_sample_data data = {
-		.addr = addr,
-	};
+	struct perf_sample_data data;
 
-	do_perf_sw_event(PERF_TYPE_SOFTWARE, event_id, nr, nmi,
-				&data, regs);
+	data.addr = addr;
+	data.raw  = NULL;
+
+	do_perf_sw_event(PERF_TYPE_SOFTWARE, event_id, nr, nmi, &data, regs);
 }
 
 static void perf_swevent_read(struct perf_event *event)