From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 10 Jul 2025 13:12:20 +0000 (+0200)
Subject: kexec_core: Drop redundant pm_restore_gfp_mask() call
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2096d42d82dc983d9db861bd6585723bd24a0819;p=thirdparty%2Flinux.git

kexec_core: Drop redundant pm_restore_gfp_mask() call

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>
---

diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index 5543695952982..351cd7d76dfa6 100644
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -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: