Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 215393bc authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched/preempt/x86: Fix voluntary preempt for x86 



The #ifdef CONFIG_PREEMPT is both not needed and wrong.

Its not required because asm/preempt.h should provide
{set,clear}_preempt_need_resched() regardless and its wrong because
for voluntary preempt we still rely on PREEMPT_NEED_RESCHED.

Reported-and-Tested-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
Fixes: 8cb75e0c ("sched/preempt: Fix up missed PREEMPT_NEED_RESCHED folding")
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Dipankar Sarma <dipankar@in.ibm.com>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20140122102435.GH31570@twins.programming.kicks-ass.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 9390675a

include/linux/preempt.h

+0 −5
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ do { \ 
#undef preempt_check_resched

#endif



#ifdef CONFIG_PREEMPT

#define preempt_set_need_resched() \

do { \

	set_preempt_need_resched(); \
@@ -144,10 +143,6 @@ do { \ 
	if (tif_need_resched()) \

		set_preempt_need_resched(); \

} while (0)

#else

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

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

#endif



#ifdef CONFIG_PREEMPT_NOTIFIERS