The following commit has been merged into the timers/core branch of tip: Commit-ID: c14fd3dcacaa480394d3ac0b4a91a7d17a4b5516 Gitweb: https://git.kernel.org/tip/c14fd3dcacaa480394d3ac0b4a91a7d17a4b5516 Author: Davidlohr Bueso <dave@xxxxxxxxxxxx> AuthorDate: Mon, 23 Jan 2023 09:32:05 -08:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Tue, 31 Jan 2023 11:23:07 +01:00 hrtimer: Rely on rt_task() for DL tasks too Checking dl_task() is redundant as rt_task() returns true for deadline tasks too. Signed-off-by: Davidlohr Bueso <dave@xxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20230123173206.6764-2-dave@xxxxxxxxxxxx --- kernel/time/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index e4f0e3b..667b713 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -2089,7 +2089,7 @@ long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_mode mode, u64 slack; slack = current->timer_slack_ns; - if (dl_task(current) || rt_task(current)) + if (rt_task(current)) slack = 0; hrtimer_init_sleeper_on_stack(&t, clockid, mode);
|