Messages in this thread | | | Date | Tue, 13 Mar 2012 11:08:40 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm tree with Linus' tree |
| |
Hi Russell,
Today's linux-next merge of the arm tree got a conflict in kernel/sched/core.c between commit 8c79a045fd59 ("sched/events: Revert trace_sched_stat_sleeptime()") from Linus' tree and commit 1cf00341547a ("sched: Introduce the finish_arch_post_lock_switch() scheduler hook") from the arm tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/sched/core.c index b342f57,ea13a09..0000000 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@@ -1932,6 -1932,8 +1932,7 @@@ static void finish_task_switch(struct r local_irq_enable(); #endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */ finish_lock_switch(rq, prev); + finish_arch_post_lock_switch(); - trace_sched_stat_sleeptime(current, rq->clock); fire_sched_in_preempt_notifiers(current); if (mm) [unhandled content-type:application/pgp-signature] | |