4.14.63-rt41-rc1 stable review patch. If anyone has any objections, please let me know.
------------------ From: Anna-Maria Gleixner <[email protected]> [ Upstream commit b5b16907c58280e015d5673dca4c6bd3fde0c348 ] This patch was required as long as RT tasks where accounted to CFS load but this was only a work around. Upstream Commit 17bdcf949d03 ("sched: Drop all load weight manipulation for RT tasks") fixed the accounting of RT tasks into CFS load. Remove the patch and fix dependencies. Signed-off-by: Anna-Maria Gleixner <[email protected]> Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]> --- kernel/time/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index ff1d60d4c0cc..f57106c6e786 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1635,13 +1635,13 @@ void update_process_times(int user_tick) /* Note: this timer irq context must be accounted for as well. */ account_process_tick(p, user_tick); - scheduler_tick(); run_local_timers(); rcu_check_callbacks(user_tick); #if defined(CONFIG_IRQ_WORK) if (in_irq()) irq_work_tick(); #endif + scheduler_tick(); if (IS_ENABLED(CONFIG_POSIX_TIMERS)) run_posix_cpu_timers(p); } -- 2.18.0
