From 1537af386a06718dba9a3954fd13a4b7e289f047 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Mon, 18 Mar 2013 11:41:46 +0900
Subject: [PATCH] --- yaml --- r: 361555 b: refs/heads/master c:
 778141e3cf0bf29f91cd3cb5c314ea477b9402a7 h: refs/heads/master i:   361553:
 e7f35186fe5519880c09477e0b0a1702efeaf234   361551:
 16303c112f5ae0491f15e7eaddc118255b3a29b8 v: v3

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

diff --git a/[refs] b/[refs]
index 2eb8645762e0..c6dde39cb402 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b34083f46c3784c6535dc9742dc13653ec1908d
+refs/heads/master: 778141e3cf0bf29f91cd3cb5c314ea477b9402a7
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
index b0cd86501c30..fa79c377d65d 100644
--- a/trunk/kernel/events/core.c
+++ b/trunk/kernel/events/core.c
@@ -5647,6 +5647,7 @@ static void perf_swevent_init_hrtimer(struct perf_event *event)
 		event->attr.sample_period = NSEC_PER_SEC / freq;
 		hwc->sample_period = event->attr.sample_period;
 		local64_set(&hwc->period_left, hwc->sample_period);
+		hwc->last_period = hwc->sample_period;
 		event->attr.freq = 0;
 	}
 }