]> Git Repo - linux.git/commitdiff
Revert "vmstat: disable vmstat_work on vmstat_cpu_down_prep()"
authorLinus Torvalds <[email protected]>
Mon, 6 Jan 2025 14:10:24 +0000 (06:10 -0800)
committerLinus Torvalds <[email protected]>
Mon, 6 Jan 2025 14:10:24 +0000 (06:10 -0800)
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]>
mm/vmstat.c

index 0889b75cef1491d53ee7ee8a6c6ae97eb175c347..4d016314a56c95e6247f8970511afb364e686278 100644 (file)
@@ -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;
 }
 
This page took 0.047843 seconds and 4 git commands to generate.