diff mbox series

[RT,2/4] Revert "hrtimer: Allow raw wakeups during boot"

Message ID 20201211214130.387508159@goodmis.org
State New
Headers show
Series Linux 5.4.82-rt46-rc1 | expand

Commit Message

Steven Rostedt Dec. 11, 2020, 9:41 p.m. UTC 
5.4.82-rt46-rc1 stable review patch.
If anyone has any objections, please let me know.

------------------

From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

This change is no longer needed since commit
   26c7295be0c5e ("kthread: Do not preempt current task if it is going to call schedule()")

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 kernel/time/hrtimer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Sebastian Andrzej Siewior Dec. 14, 2020, 8:33 a.m. UTC | #1 
On 2020-12-11 16:41:05 [-0500], Steven Rostedt wrote:
> 5.4.82-rt46-rc1 stable review patch.

> If anyone has any objections, please let me know.

> 

> ------------------

> 

> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

> 

> This change is no longer needed since commit

>    26c7295be0c5e ("kthread: Do not preempt current task if it is going to call schedule()")


This patch has been integrated in v5.7-rc1 and it made its way into
v5.4.61. Okay, why not.

> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>


Sebastian
diff mbox series

Patch

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 41cc1c8530d8..42705a04c808 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1819,7 +1819,7 @@  static void __hrtimer_init_sleeper(struct hrtimer_sleeper *sl,
 	 * expiry.
 	 */
 	if (IS_ENABLED(CONFIG_PREEMPT_RT)) {
-		if ((task_is_realtime(current) && !(mode & HRTIMER_MODE_SOFT)) || system_state != SYSTEM_RUNNING)
+		if (task_is_realtime(current) && !(mode & HRTIMER_MODE_SOFT))
 			mode |= HRTIMER_MODE_HARD;
 	}