diff --git a/[refs] b/[refs]
index 88578d027366..5fcb0cd5a086 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a08b159fc243dbfe415250466d24cfc5010deee5
+refs/heads/master: 615a3f1e055ac9b0ae74e1f935a12ea2cfe2a2ad
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
index 7373b96bc36c..5ea0240adab2 100644
--- a/trunk/kernel/perf_counter.c
+++ b/trunk/kernel/perf_counter.c
@@ -1281,7 +1281,7 @@ static unsigned int perf_poll(struct file *file, poll_table *wait)
 static void perf_counter_reset(struct perf_counter *counter)
 {
 	(void)perf_counter_read(counter);
-	atomic_set(&counter->count, 0);
+	atomic64_set(&counter->count, 0);
 	perf_counter_update_userpage(counter);
 }