]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
kexec_core: Drop redundant pm_restore_gfp_mask() call
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 10 Jul 2025 13:12:20 +0000 (15:12 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 15 Jul 2025 12:56:38 +0000 (14:56 +0200)
Drop the direct pm_restore_gfp_mask() call from the KEXEC_JUMP flow in
kernel_kexec() because it is redundant.  Namely, dpm_resume_end()
called beforehand in the same code path invokes that function and
it is sufficient to invoke it once.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Baoquan He <bhe@redhat.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://patch.msgid.link/1949230.tdWV9SEqCh@rjwysocki.net
[ rjw: Rebase after fixing up previous changes ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
kernel/kexec_core.c

index 5543695952982b8f98d035bd8ddf0bbf4638cd1e..351cd7d76dfa6056783e6e7d222f84a6d6e260dd 100644 (file)
@@ -1135,7 +1135,6 @@ int kernel_kexec(void)
                dpm_resume_start(PMSG_RESTORE);
  Resume_devices:
                dpm_resume_end(PMSG_RESTORE);
-               pm_restore_gfp_mask();
                console_resume_all();
                thaw_processes();
  Restore_console: