Revert "vmstat: disable vmstat_work on vmstat_cpu_down_prep()"

cd6313be · Linus Torvalds <[email protected]> · 2025-01-06 06:10:24 -08:00

This reverts commit adcfb264c3ed51fbbf5068ddf10d309a63683868.

It turns out this just causes a different warning splat instead that
seems to be much easier to trigger, so let's revert ASAP.

Reported-and-bisected-by: Borislav Petkov <[email protected]>
Tested-by: Breno Leitao <[email protected]>
Reported-by: Alexander Gordeev <[email protected]>
Link: https://lore.kernel.org/all/20250106131817.GAZ3vYGVr3-hWFFPLj@fat_crate.local/
Cc: Koichiro Den <[email protected]>
Cc: Sebastian Andrzej Siewior <[email protected]>
Cc: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: cd6313beaeaea0b2e6d428afef7a86a986b50abe
Parents: 9d895519

Changes

1 files changed · +1 −2

File	Status	Add	Del	Content
mm/vmstat.c	modified	+1	−2	View file

mm/vmstat.c

View file

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 0889b75..4d01631 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -2148,14 +2148,13 @@ static int vmstat_cpu_online(unsigned int cpu)
 	if (!node_state(cpu_to_node(cpu), N_CPU)) {
 		node_set_state(cpu_to_node(cpu), N_CPU);
 	}
-	enable_delayed_work(&per_cpu(vmstat_work, cpu));
 
 	return 0;
 }
 
 static int vmstat_cpu_down_prep(unsigned int cpu)
 {
-	disable_delayed_work_sync(&per_cpu(vmstat_work, cpu));
+	cancel_delayed_work_sync(&per_cpu(vmstat_work, cpu));
 	return 0;
 }
 