The patch titled
kexec jump: remove duplication of kexec_restart_prepare()
has been added to the -mm tree. Its filename is
kexec-jump-remove-duplication-of-kexec_restart_prepare.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: kexec jump: remove duplication of kexec_restart_prepare()
From: Huang Ying <ying.huang@xxxxxxxxx>
Call kernel_restart_prepare() in kernel_kexec() instead of duplicating the
code.
Signed-off-by: Huang Ying <ying.huang@xxxxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxxx>
Acked-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/reboot.h | 1 +
kernel/kexec.c | 6 +-----
kernel/sys.c | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff -puN include/linux/reboot.h~kexec-jump-remove-duplication-of-kexec_restart_prepare include/linux/reboot.h
--- a/include/linux/reboot.h~kexec-jump-remove-duplication-of-kexec_restart_prepare
+++ a/include/linux/reboot.h
@@ -59,6 +59,7 @@ extern void machine_crash_shutdown(struc
* Architecture independent implemenations of sys_reboot commands.
*/
+extern void kernel_restart_prepare(char *cmd);
extern void kernel_restart(char *cmd);
extern void kernel_halt(void);
extern void kernel_power_off(void);
diff -puN kernel/kexec.c~kexec-jump-remove-duplication-of-kexec_restart_prepare kernel/kexec.c
--- a/kernel/kexec.c~kexec-jump-remove-duplication-of-kexec_restart_prepare
+++ a/kernel/kexec.c
@@ -1472,11 +1472,7 @@ int kernel_kexec(void)
} else
#endif
{
- blocking_notifier_call_chain(&reboot_notifier_list,
- SYS_RESTART, NULL);
- system_state = SYSTEM_RESTART;
- device_shutdown();
- sysdev_shutdown();
+ kernel_restart_prepare(NULL);
printk(KERN_EMERG "Starting new kernel\n");
machine_shutdown();
}
diff -puN kernel/sys.c~kexec-jump-remove-duplication-of-kexec_restart_prepare kernel/sys.c
--- a/kernel/sys.c~kexec-jump-remove-duplication-of-kexec_restart_prepare
+++ a/kernel/sys.c
@@ -281,7 +281,7 @@ void emergency_restart(void)
}
EXPORT_SYMBOL_GPL(emergency_restart);
-static void kernel_restart_prepare(char *cmd)
+void kernel_restart_prepare(char *cmd)
{
blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd);
system_state = SYSTEM_RESTART;
_
Patches currently in -mm which might be from ying.huang@xxxxxxxxx are
origin.patch
kexec-jump-clean-up-ifdef-and-comments.patch
kexec-jump-rename-kexec_control_code_size-to-kexec_control_page_size.patch
kexec-jump-check-code-size-in-control-page.patch
kexec-jump-remove-duplication-of-kexec_restart_prepare.patch
kexec-jump-in-sync-with-hibernation-implementation.patch
kexec-jump-__ftrace_enabled_save-restore.patch
kexec-jump-fix-for-ftrace.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
