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

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.netSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 9390675a
...@@ -134,7 +134,6 @@ do { \ ...@@ -134,7 +134,6 @@ do { \
#undef preempt_check_resched #undef preempt_check_resched
#endif #endif
#ifdef CONFIG_PREEMPT
#define preempt_set_need_resched() \ #define preempt_set_need_resched() \
do { \ do { \
set_preempt_need_resched(); \ set_preempt_need_resched(); \
...@@ -144,10 +143,6 @@ do { \ ...@@ -144,10 +143,6 @@ do { \
if (tif_need_resched()) \ if (tif_need_resched()) \
set_preempt_need_resched(); \ set_preempt_need_resched(); \
} while (0) } while (0)
#else
#define preempt_set_need_resched() do { } while (0)
#define preempt_fold_need_resched() do { } while (0)
#endif
#ifdef CONFIG_PREEMPT_NOTIFIERS #ifdef CONFIG_PREEMPT_NOTIFIERS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment