Merge commit 'v2.6.35-rc4' into perf/core
Ingo Molnar [Mon, 5 Jul 2010 06:30:55 +0000 (08:30 +0200)]
Merge reason: Pick up the latest perf fixes

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

1  2 
MAINTAINERS
Makefile
arch/arm/kernel/perf_event.c
init/main.c
kernel/sched.c
scripts/package/Makefile

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
@@@ -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;
  
diff --cc init/main.c
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge