lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.35-rc4' into perf/core

Browse Source 
Merge reason: Pick up the latest perf fixes

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2010-07-05 08:30:55 +02:00
parent 0879b100f3 815c4163b6
commit 08f8ba0799
179 changed files with 1876 additions and 1461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/kernel/perf_event.c
View File

@ -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 = local64_read(&hwc->prev_count);