>From 504608d1b7ee9534383e48de7ab79fca6a55138e Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Mon, 28 Jan 2013 16:41:21 +0800 Subject: [PATCH 2/3] sched/arch: Introduce the finish_arch_post_lock_switch() scheduler callback upstream 01f23e1630d944f7085cd8fd5793e31ea91c03d8 commit. This callback is called by the scheduler after rq->lock has been released and interrupts enabled. It will be used in subsequent patches on the ARM architecture. Signed-off-by: Catalin Marinas Reviewed-by: Will Deacon Reviewed-by: Frank Rowand Tested-by: Will Deacon Tested-by: Marc Zyngier Acked-by: Peter Zijlstra Link: http://lkml.kernel.org/n/20120313110840.7b444deb6b1bb902c15f3cdf@canb.auug.org.au Signed-off-by: Ingo Molnar --- kernel/sched.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/kernel/sched.c b/kernel/sched.c index 79efd9d..2bc9b2d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -845,6 +845,9 @@ static inline u64 global_rt_runtime(void) #ifndef finish_arch_switch # define finish_arch_switch(prev) do { } while (0) #endif +#ifndef finish_arch_post_lock_switch() +# define finish_arch_post_lock_switch() do { } while (0) +#endif static inline int task_current(struct rq *rq, struct task_struct *p) { @@ -2805,6 +2808,7 @@ static void finish_task_switch(struct rq *rq, struct task_struct *prev) local_irq_enable(); #endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */ finish_lock_switch(rq, prev); + finish_arch_post_lock_switch(); fire_sched_in_preempt_notifiers(current); if (mm) -- 1.7.6