From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 5 Jul 2010 06:30:55 +0000 (+0200)
Subject: Merge commit 'v2.6.35-rc4' into perf/core
X-Git-Tag: v2.6.36-rc1~532^2~41
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=08f8ba07998ab1b9efcdd3f28dadf6866a605ddb;p=net-next-2.6.git

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

Merge reason: Pick up the latest perf fixes

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

08f8ba07998ab1b9efcdd3f28dadf6866a605ddb
diff --cc arch/arm/kernel/perf_event.c
index 5b7cfafc072,de12536d687..417c392ddf1
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@@ -201,13 -201,13 +201,13 @@@ armpmu_event_update(struct perf_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);
 +	prev_raw_count = local64_read(&hwc->prev_count);
  	new_raw_count = armpmu->read_counter(idx);
  
 -	if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
 +	if (local64_cmpxchg(&hwc->prev_count, prev_raw_count,
  			     new_raw_count) != prev_raw_count)
  		goto again;