From 4a8c1edd1fad1337f903ba95816e0d836ec90886 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 23 Nov 2009 10:57:59 +0100 Subject: [PATCH] --- yaml --- r: 169745 b: refs/heads/master c: a4234bfcf4d72a10a99176cdef007345e9c3b4aa h: refs/heads/master i: 169743: c81cc149abf402548eded61c5e83b4a30475a710 v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index df0723d06a45..c4dc04ed60d7 100644 --- 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 index abe1ef47496c..20df8aba8da5 100644 --- 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)