Commit ca195b7f authored by Huang Ying's avatar Huang Ying Committed by Linus Torvalds
Browse files

kexec jump: remove duplication of kexec_restart_prepare() 



Call kernel_restart_prepare() in kernel_kexec() instead of duplicating the
code.

Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fb45daa6

include/linux/reboot.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ extern void machine_crash_shutdown(struct pt_regs *); 
 * 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);

kernel/kexec.c

+1 −5
Original line number Diff line number Diff line
@@ -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();

	}

kernel/sys.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,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;