Commit 04936948 authored Feb 28, 2016 by Josh Poimboeuf Committed by Ingo Molnar Feb 29, 2016

sched: Always inline context_switch()



When CONFIG_GCOV is enabled, gcc decides to put context_switch()
out-of-line, which is inconsistent with its normal behavior.

It also causes an objtool warning because __schedule() no longer inlines
context_switch(), so the "STACK_FRAME_NON_STANDARD(__schedule)"
statement loses its effect.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Bernd Petrovitsch <bernd@petrovitsch.priv.at>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Chris J Arges <chris.j.arges@canonical.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Pedro Alves <palves@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: live-patching@vger.kernel.org
Link: http://lkml.kernel.org/r/d62aee926b6e303394e34a06999a964dc2773cf6.1456719558.git.jpoimboe@redhat.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 8e05e96a

kernel/sched/core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2763,7 +2763,7 @@ asmlinkage __visible void schedule_tail(struct task_struct *prev)
	/*		/*
	* context_switch - switch to the new MM and the new thread's register state.		* context_switch - switch to the new MM and the new thread's register state.
	*/		*/
	static inline struct rq *		static __always_inline struct rq *
	context_switch(struct rq rq, struct task_struct prev,		context_switch(struct rq rq, struct task_struct prev,
	struct task_struct *next)		struct task_struct *next)
	{		{

Admin message