From 681c633847b54796c0bb04f08becee73b82452ea Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Thu, 5 Apr 2012 18:24:43 +0200
Subject: [PATCH] --- yaml --- r: 304831 b: refs/heads/master c:
 33b07b8be7f0e1e8e4184e3473d71f174e4b0641 h: refs/heads/master i:   304829:
 5363cdb4ab5adebb2e8dcc3f87bde017bfda27ff   304827:
 9dc07c0e54ef780c3a724c27235f93d664f89831   304823:
 6394dd2b104826572208b765aefff38a95598312   304815:
 0d8419905effab4088be281f4fc3c4a39c19d427   304799:
 991e46ad8c20b3b78f1fa33387374b2a993dbcec   304767:
 ba50af8d72ea9d36b1fd49d24b190d7267909dd7 v: v3

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

diff --git a/[refs] b/[refs]
index 9d591aa6da3f..f816667f8380 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f09fc688936705b2020ca247df39ee27283668a
+refs/heads/master: 33b07b8be7f0e1e8e4184e3473d71f174e4b0641
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
index a6a9ec4cd8f5..9789a56b7d54 100644
--- a/trunk/kernel/events/core.c
+++ b/trunk/kernel/events/core.c
@@ -5350,7 +5350,7 @@ static enum hrtimer_restart perf_swevent_hrtimer(struct hrtimer *hrtimer)
 
 	if (regs && !perf_exclude_event(event, regs)) {
 		if (!(event->attr.exclude_idle && is_idle_task(current)))
-			if (perf_event_overflow(event, &data, regs))
+			if (__perf_event_overflow(event, 1, &data, regs))
 				ret = HRTIMER_NORESTART;
 	}