From 016b707ebb81e84eaf2a97d7208b9c53f188b53d Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 2 Jul 2010 16:41:52 +0100
Subject: [PATCH] --- yaml --- r: 200807 b: refs/heads/master c:
 446a5a8b1eb91a6990e5c8fe29f14e7a95b69132 h: refs/heads/master i:   200805:
 d835d89d46ab71b14c6ac463df3e7db1570423e3   200803:
 abe21004c6583d90c51dcfea7b89168a538a111c   200799:
 2d8fbfac56368ea3c8137b27b27528e441a3a021 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/perf_event.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 68b4afe44ad7..0469729bbb2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42c4dafe803dcad82980fd8b0831a89032156f93
+refs/heads/master: 446a5a8b1eb91a6990e5c8fe29f14e7a95b69132
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index c45768614c8a..de12536d687f 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -201,7 +201,7 @@ armpmu_event_update(struct perf_event *event,
 {
 	int shift = 64 - 32;
 	s64 prev_raw_count, new_raw_count;
-	s64 delta;
+	u64 delta;
 
 again:
 	prev_raw_count = atomic64_read(&hwc->prev_count);