From 4e5a3dec5a1e5002f92e7e049986d67055361177 Mon Sep 17 00:00:00 2001 From: Deng-Cheng Zhu Date: Fri, 21 Jan 2011 16:19:21 +0800 Subject: [PATCH] --- yaml --- r: 234155 b: refs/heads/master c: ba9786f32473410bbec256db9745a7fbcaace69f h: refs/heads/master i: 234153: dba9bc72387d3eafb25c4c67862646ad032e87bb 234151: ecb1643636b234b37270a9928bcb1cef9d1c2ecc v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/perf_event.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d59b843c425e..0b73e7a658b4 100644 --- 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 index 8f7d2f84d095..a8244854d3dc 100644 --- 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);