---

yaml --- r: 234155 b: refs/heads/master c: ba9786f h: refs/heads/master i: 234153: dba9bc7 234151: ecb1643 v: v3
git-mirror · Mar 14, 2011 · 4e5a3de · 4e5a3de
1 parent e46ba08
commit 4e5a3de
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: 98f92f2f9e2fd959157b1d52f7ae160683812740
+refs/heads/master: ba9786f32473410bbec256db9745a7fbcaace69f
diff --git a/trunk/arch/mips/kernel/perf_event.c b/trunk/arch/mips/kernel/perf_event.c
@@ -169,7 +169,7 @@ static void mipspmu_event_update(struct perf_event *event,
 	unsigned long flags;
 	int shift = 64 - TOTAL_BITS;
 	s64 prev_raw_count, new_raw_count;
-	s64 delta;
+	u64 delta;
 
 again:
 	prev_raw_count = local64_read(&hwc->prev_count);