sched: Consolidate open coded preemptible() checks (fbb00b56) · Commits · 戴 / test

preempt_schedule() and preempt_schedule_context() open code their preemptability checks. Use the standard API instead for consolidation. Signed-off-by:

Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Li Zhong <zhong@linux.vnet.ibm.com> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Borislav Petkov <bp@alien8.de> Cc: Alex Shi <alex.shi@intel.com> Cc: Paul Turner <pjt@google.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Vincent Guittot <vincent.guittot@linaro.org>

kernel/context_tracking.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -87,10 +87,9 @@ void user_enter(void)
		*/
		void __sched notrace preempt_schedule_context(void)
		{
		struct thread_info *ti = current_thread_info();
		enum ctx_state prev_ctx;

		if (likely(ti->preempt_count \|\| irqs_disabled()))
		if (likely(!preemptible()))
		return;

		/*

kernel/sched/core.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2510,13 +2510,11 @@ void __sched schedule_preempt_disabled(void)
		*/
		asmlinkage void __sched notrace preempt_schedule(void)
		{
		struct thread_info *ti = current_thread_info();

		/*
		* If there is a non-zero preempt_count or interrupts are disabled,
		* we do not want to preempt the current task. Just return..
		*/
		if (likely(ti->preempt_count \|\| irqs_disabled()))
		if (likely(!preemptible()))
		return;

		do {

Admin message