Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / kernel / time / tick-common.c

diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index d663249..4678935 100644 (file)
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -470,6 +470,13 @@ void tick_resume_local(void)
                else
                        tick_resume_oneshot();
        }
+
+       /*
+        * Ensure that hrtimers are up to date and the clockevents device
+        * is reprogrammed correctly when high resolution timers are
+        * enabled.
+        */
+       hrtimers_resume_local();
 }
 
 /**