Patches contributed by Eötvös Lorand University
commit 8bd0e1be25c43a9fbd33a8de06449088879d527a
Merge: 39ef13a4ac28 b7dcb857cc3e
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Jul 6 09:00:32 2010 +0200
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 08f8ba07998ab1b9efcdd3f28dadf6866a605ddb
Merge: 0879b100f3c1 815c4163b6c8
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jul 5 08:30:55 2010 +0200
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>
diff --cc arch/arm/kernel/perf_event.c
index 5b7cfafc0720,de12536d687f..417c392ddf1c
--- 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;
commit 0a54cec0c25cc49e3b68b14c205f1f6cff13f5e1
Merge: ec8c27e04f89 980019d74e4b
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jul 1 08:49:28 2010 +0200
Merge branch 'linus' into core/rcu
Conflicts:
fs/fs-writeback.c
Merge reason: Resolve the conflict
Note, i picked the version from Linus's tree, which effectively reverts
the fs-writeback.c bits of:
b97181f: fs: remove all rcu head initializations, except on_stack initializations
As the upstream changes to this file changed this code heavily and the
first attempt to resolve the conflict resulted in a non-booting kernel.
It's safer to re-try this portion of the commit cleanly.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 9a15a07fe2175dc25cd928a354b3839f562ac8cc
Merge: ffabd99e051e 830f4c803196
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jun 25 16:16:44 2010 +0200
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 646b1db4956ba8bf748b835b5eba211133d91c2e
Merge: 0f2c3de2ba11 7e27d6e778cd
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jun 18 10:53:12 2010 +0200
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
commit 4cb6948e5365ab874bb71ac35fb6b7c6dd305765
Merge: 89275d59b572 7e27d6e778cd
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jun 18 10:46:31 2010 +0200
Merge commit 'v2.6.35-rc3' into sched/core
Merge reason: Update to the latest -rc.
commit 174787cb5144e5a45141ec7cb9d95ea29bbe22bb
Merge: 1d90f2e707e7 a8fb26080535
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jun 11 10:18:06 2010 +0200
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
commit c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8
Merge: 7be7923633a1 018378c55b03
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 9 18:55:20 2010 +0200
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
commit 16106822b67e0a5eb228aebf47e33d6cad1e91b6
Merge: 84bb671dc46d b9b76dfaac6f
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jun 9 00:45:53 2010 +0200
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
commit 95ae3c59fa8ad616c73745e21154b5af0fb10168
Merge: dc61b1d65e35 21aa9af03d06
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Jun 8 23:20:59 2010 +0200
Merge branch 'sched-wq' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq into sched/core