Skip to content

Commit

Permalink
preempt: Move preempt_enable_no_resched() to the RT block
Browse files Browse the repository at this point in the history
preempt_enable_no_resched() should point to preempt_enable() on
PREEMPT_RT so nobody is playing any preempt tricks and enables
preemption without checking for the need-resched flag.

This was misplaced in v3.14.0-rt1 und remained unnoticed until now.

Point preempt_enable_no_resched() and preempt_enable() on RT.

Cc: stable-rt@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  • Loading branch information
Sebastian Andrzej Siewior committed Sep 22, 2021
1 parent 1b91b8a commit 1a45b35
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions include/linux/preempt.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,12 @@ do { \
preempt_count_dec(); \
} while (0)

#ifdef CONFIG_PREEMPT_RT
#ifndef CONFIG_PREEMPT_RT
# define preempt_enable_no_resched() sched_preempt_enable_no_resched()
# define preempt_check_resched_rt() preempt_check_resched()
# define preempt_check_resched_rt() barrier();
#else
# define preempt_enable_no_resched() preempt_enable()
# define preempt_check_resched_rt() barrier();
# define preempt_check_resched_rt() preempt_check_resched()
#endif

#define preemptible() (preempt_count() == 0 && !irqs_disabled())
Expand Down

0 comments on commit 1a45b35

Please sign in to comment.