From 99d65b5d15fec68db1f34941499faa24be192ca3 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Tue, 1 Dec 2009 17:30:08 +0800
Subject: [PATCH] --- yaml --- r: 169838 b: refs/heads/master c:
 59d069eb5ae9b033ed1c124c92e1532c4a958991 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 86b1aaa29f0f..952157fd17c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b498ce1f2753b9724b2fc05d2057f7d1490cfa93
+refs/heads/master: 59d069eb5ae9b033ed1c124c92e1532c4a958991
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 0b9ca2d834dd..040ee517c808 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.period = event->hw.last_period;
 	regs = get_irq_regs();
 	/*
 	 * In case we exclude kernel IPs or are somehow not in interrupt