Patches contributed by Eötvös Lorand University
commit 050c6c9b896625d9fa498265be17b82c5fc65257
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Dec 19 23:24:27 2010 +0100
sched: Remove debugging check
Linus reported that the new warning introduced by commit f26f9aff6aaf
"Sched: fix skip_clock_update optimization" triggers. The need_resched
flag can be set by other CPUs asynchronously so this debug check is
bogus - remove it.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <AANLkTinJ8hAG1TpyC+CSYPR47p48+1=E7fiC45hMXT_1@mail.gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/kernel/sched.c b/kernel/sched.c
index 456c99054160..297d1a0eedb0 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4128,7 +4128,6 @@ asmlinkage void __sched schedule(void)
rq->nr_switches++;
rq->curr = next;
++*switch_count;
- WARN_ON_ONCE(test_tsk_need_resched(next));
context_switch(rq, prev, next); /* unlocks the rq */
/*
commit ca680888d5d0d03862ec311a83c6a1c7a1e00a01
Merge: 40dc11ffb35e b0c3844d8af6
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Dec 19 16:35:08 2010 +0100
Merge commit 'v2.6.37-rc6' into sched/core
Merge reason: Update to the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 006b20fe4c69189b0d854e5eabf269e50ca86cdd
Merge: 5f29805a4f46 d949750fed16
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 16 11:22:25 2010 +0100
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to apply a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit d949750fed168b6553ca11ed19e4affd19d7a4d7
Merge: ce677831a4ab e63233f75a1a
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 16 11:21:24 2010 +0100
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
commit 67b96c182c36c83cd6881122b4a7922b2634047b
Merge: efc70d241f5c ddbc24b72c2c
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Dec 10 00:31:30 2010 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit efc70d241f5c7fc0a9f1c2a01781ed946d9dbe21
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Dec 10 00:27:23 2010 +0100
perf, sparc: Fix CONFIG_PERF_EVENTS=y build error
Fix a typo in:
004417a6d468: perf, arch: Cleanup perf-pmu init vs lockup-detector
Which caused a build failure on Sparc, reported by Stephen Rothwell.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index 75c5b1263970..39348b1cebd3 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -1323,7 +1323,7 @@ int __init init_hw_perf_events(void)
return 0;
}
-early_initcall(init_hw_perf_event);
+early_initcall(init_hw_perf_events);
void perf_callchain_kernel(struct perf_callchain_entry *entry,
struct pt_regs *regs)
commit 8e9255e6a2141e050d51bc4d96dbef494a87d653
Merge: 5091faa449ee 6313e3c21743
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Dec 8 20:15:26 2010 +0100
Merge branch 'linus' into sched/core
Merge reason: we want to queue up dependent cleanup
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 75b5293a5d176cd9caf6dc590da4f3458c048c3c
Merge: 10a18d7dc0d9 ce47dc56a224
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Dec 7 07:51:14 2010 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
commit 10a18d7dc0d9f12483c95ffc234118e9b80edfeb
Merge: f984ba4eb575 cf7d7e5a1980
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Dec 7 07:49:48 2010 +0100
Merge commit 'v2.6.37-rc5' into perf/core
Merge reason: Pick up the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit e4b546a3643fbfc510d5ef7db538e4d3ab00effb
Merge: b3d006c0e745 d7470b6afca8
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 2 11:20:11 2010 +0100
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core