On Mon, Jan 06, 2025 at 09:24:55AM -0800, Lucas De Marchi wrote:
> This reverts commit adcfb264c3ed51fbbf5068ddf10d309a63683868.
>
> It completely tanks the CI and nothing gets tested. This is being either
> reverted upstream or the fix will conflict with the revert and we will
> find out when it does.
>
> Link:
> https://lore.kernel.org/all/g4sefofdrwu72ijhse7k57wuvrwhvn2eoqmc4jdoepkcgs7h5n@hmuhkwnye6pe/#t
> References: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13464
> Signed-off-by: Lucas De Marchi <lucas.demar...@intel.com>
Acked-by: Matt Roper <matthew.d.ro...@intel.com>
for putting this in the CI branch until a real fix/revert arrives from
upstream.
Matt
> ---
> mm/vmstat.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/mm/vmstat.c b/mm/vmstat.c
> index 0889b75cef149..4d016314a56c9 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;
> }
>
> --
> 2.47.0
>
--
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
