1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 7c567f0c87f5..f0dd9d42bc7b 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -274,10 +274,12 @@ static void __arch_timer_setup(unsigned type,
                 if (arch_timer_use_virtual) {
                         clk->irq = arch_timer_ppi[VIRT_PPI];
                         clk->set_state_shutdown = arch_timer_shutdown_virt;
+                        clk->set_state_oneshot_stopped = arch_timer_shutdown_virt;
                         clk->set_next_event = arch_timer_set_next_event_virt;
                 } else {
                         clk->irq = arch_timer_ppi[PHYS_SECURE_PPI];
                         clk->set_state_shutdown = arch_timer_shutdown_phys;
+                        clk->set_state_oneshot_stopped = arch_timer_shutdown_phys;
                         clk->set_next_event = arch_timer_set_next_event_phys;
                 }
         } else {
@@ -287,10 +289,12 @@ static void __arch_timer_setup(unsigned type,
                 clk->cpumask = cpu_all_mask;
                 if (arch_timer_mem_use_virtual) {
                         clk->set_state_shutdown = arch_timer_shutdown_virt_mem;
+                        clk->set_state_oneshot_stopped = arch_timer_shutdown_virt_mem;
                         clk->set_next_event =
                                 arch_timer_set_next_event_virt_mem;
                 } else {
                         clk->set_state_shutdown = arch_timer_shutdown_phys_mem;
+                        clk->set_state_oneshot_stopped = arch_timer_shutdown_phys_mem;
                         clk->set_next_event =
                                 arch_timer_set_next_event_phys_mem;
                 }