The following commit has been merged into the timers/core branch of tip: Commit-ID: 78b5c2ca5f27534dc04fbbe0b491dd3bd4ec814b Gitweb: https://git.kernel.org/tip/78b5c2ca5f27534dc04fbbe0b491dd3bd4ec814b Author: Frederic Weisbecker <frederic@kernel.org> AuthorDate: Tue, 29 Oct 2024 13:54:46 +01:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Thu, 31 Oct 2024 10:41:42 +01:00 clocksource/drivers/arm_arch_timer: Remove clockevents shutdown call on offlining The clockevents core already detached and unregistered it at this stage. Signed-off-by: Frederic Weisbecker <frederic@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/all/20241029125451.54574-6-frederic@kernel.org --- drivers/clocksource/arm_arch_timer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index XXXXXXX..XXXXXXX 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -XXX,XX +XXX,XX @@ static void arch_timer_stop(struct clock_event_device *clk) disable_percpu_irq(arch_timer_ppi[arch_timer_uses_ppi]); if (arch_timer_has_nonsecure_ppi()) disable_percpu_irq(arch_timer_ppi[ARCH_TIMER_PHYS_NONSECURE_PPI]); - - clk->set_state_shutdown(clk); } static int arch_timer_dying_cpu(unsigned int cpu) The following commit has been merged into the timers/core branch of tip: Commit-ID: 5f2fa3a59a715ccd7dfe041fe99d21bd504dd4f9 Gitweb: https://git.kernel.org/tip/5f2fa3a59a715ccd7dfe041fe99d21bd504dd4f9 Author: Frederic Weisbecker <frederic@kernel.org> AuthorDate: Tue, 29 Oct 2024 13:54:46 +01:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Wed, 30 Oct 2024 21:02:22 +01:00 clocksource/drivers/arm_arch_timer: Remove clockevents shutdown call on offlining The clockevents core already detached and unregistered it at this stage. Signed-off-by: Frederic Weisbecker <frederic@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/all/20241029125451.54574-6-frederic@kernel.org --- drivers/clocksource/arm_arch_timer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index XXXXXXX..XXXXXXX 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -XXX,XX +XXX,XX @@ static void arch_timer_stop(struct clock_event_device *clk) disable_percpu_irq(arch_timer_ppi[arch_timer_uses_ppi]); if (arch_timer_has_nonsecure_ppi()) disable_percpu_irq(arch_timer_ppi[ARCH_TIMER_PHYS_NONSECURE_PPI]); - - clk->set_state_shutdown(clk); } static int arch_timer_dying_cpu(unsigned int cpu)