From 36db7d655927b8f724a903c241356a25ddd11752 Mon Sep 17 00:00:00 2001 From: Xiao Guangrong Date: Thu, 10 Dec 2009 14:00:51 +0800 Subject: [PATCH] --- yaml --- r: 175431 b: refs/heads/master c: 21140f4d3387aa2213f1deea0128df1dbf924379 h: refs/heads/master i: 175429: bc434c80cafd76a7f103fa9ad3b4645e18300301 175427: 26c66cf43c8d8cac7984f54dad4069da0002cd49 175423: 04ceff4d184d7d1014bdaf0c90feab4be7950e68 v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 66abf4aa50e0..4aef08cfbf98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0c9e72150c07b4a6766cd24a6f685ec2dc9c343 +refs/heads/master: 21140f4d3387aa2213f1deea0128df1dbf924379 diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index 94e1b28333ae..3a5d6c4786bb 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -4010,6 +4010,7 @@ static enum hrtimer_restart perf_swevent_hrtimer(struct hrtimer *hrtimer) event->pmu->read(event); data.addr = 0; + data.raw = NULL; data.period = event->hw.last_period; regs = get_irq_regs(); /*