---

yaml --- r: 200807 b: refs/heads/master c: 446a5a8 h: refs/heads/master i: 200805: d835d89 200803: abe2100 200799: 2d8fbfa v: v3
git-mirror · Jul 4, 2010 · 016b707 · 016b707
1 parent 6318f37
commit 016b707
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);