Skip to content

Commit

Permalink
Revert "vmstat: disable vmstat_work on vmstat_cpu_down_prep()"
Browse files Browse the repository at this point in the history
This reverts commit adcfb26.

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]>
  • Loading branch information
torvalds committed Jan 6, 2025
1 parent 9d89551 commit cd6313b
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions mm/vmstat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit cd6313b

Please sign in to comment.