Commit 1f56ee7b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/arch' into sched/urgent 



Merge reason: It has not gone upstream via the ARM tree, merge it via
              the scheduler tree.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 6135fc1e 01f23e16

kernel/sched/core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1962,6 +1962,7 @@ static void finish_task_switch(struct rq *rq, struct task_struct *prev) 
	local_irq_enable();

	local_irq_enable();

#endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */

#endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */

	finish_lock_switch(rq, prev);

	finish_lock_switch(rq, prev);

	finish_arch_post_lock_switch();





	fire_sched_in_preempt_notifiers(current);

	fire_sched_in_preempt_notifiers(current);

	if (mm)

	if (mm)

kernel/sched/sched.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -681,6 +681,9 @@ static inline int task_running(struct rq *rq, struct task_struct *p) 
#ifndef finish_arch_switch

#ifndef finish_arch_switch

# define finish_arch_switch(prev)	do { } while (0)

# define finish_arch_switch(prev)	do { } while (0)

#endif

#endif

#ifndef finish_arch_post_lock_switch

# define finish_arch_post_lock_switch()	do { } while (0)

#endif





#ifndef __ARCH_WANT_UNLOCKED_CTXSW

#ifndef __ARCH_WANT_UNLOCKED_CTXSW

static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)

static inline void prepare_lock_switch(struct rq *rq, struct task_struct *next)