From 20d7404d1e6c04e40f5d599f2be3e8f179dd17c2 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 26 Apr 2025 12:23:19 +0200 Subject: [PATCH] Revert "hrtimers: Handle CPU state correctly on hotplug" Causes sleep of death. This reverts commit 95e4f62df23f4df1ce6ef897d44b8e23c260921a. Change-Id: Id3e5f5a71b7d2d57aaa1b9bba7b4ef02221bdba7 --- include/linux/hrtimer.h | 1 - kernel/time/hrtimer.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index d234fcfc5b96..005f9a8ecdc8 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -534,7 +534,6 @@ extern void __init hrtimers_init(void); extern void sysrq_timer_list_show(void); int hrtimers_prepare_cpu(unsigned int cpu); -int hrtimers_cpu_starting(unsigned int cpu); #ifdef CONFIG_HOTPLUG_CPU int hrtimers_dead_cpu(unsigned int cpu); #else diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index a221f10a46e1..1e4a23a463a1 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -2073,15 +2073,6 @@ int hrtimers_prepare_cpu(unsigned int cpu) } cpu_base->cpu = cpu; - hrtimer_cpu_base_init_expiry_lock(cpu_base); - return 0; -} - -int hrtimers_cpu_starting(unsigned int cpu) -{ - struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases); - - /* Clear out any left over state from a CPU down operation */ cpu_base->active_bases = 0; cpu_base->hres_active = 0; cpu_base->hang_detected = 0; @@ -2089,6 +2080,7 @@ int hrtimers_cpu_starting(unsigned int cpu) cpu_base->softirq_next_timer = NULL; cpu_base->expires_next = KTIME_MAX; cpu_base->softirq_expires_next = KTIME_MAX; + hrtimer_cpu_base_init_expiry_lock(cpu_base); return 0; } @@ -2206,7 +2198,6 @@ void hrtimer_quiesce_cpu(void *cpup) void __init hrtimers_init(void) { hrtimers_prepare_cpu(smp_processor_id()); - hrtimers_cpu_starting(smp_processor_id()); open_softirq(HRTIMER_SOFTIRQ, hrtimer_run_softirq); }