adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

kexec jump: remove duplication of kexec_restart_prepare()

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

Signed-off-by: Huang Ying <ying.huang@intel.com>
Acked-by: Pavel Machek <pavel@suse.cz>
Acked-by: Vivek 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Huang Ying 2008-08-15 00:40:24 -07:00 committed by Linus Torvalds
parent fb45daa69d
commit ca195b7f6d
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/linux/reboot.h
View file

@ -59,6 +59,7 @@ extern void machine_crash_shutdown(struct pt_regs *);
* Architecture independent implemenations of sys_reboot commands. * Architecture independent implemenations of sys_reboot commands.
*/ */
extern void kernel_restart_prepare(char *cmd);
extern void kernel_restart(char *cmd); extern void kernel_restart(char *cmd);
extern void kernel_halt(void); extern void kernel_halt(void);
extern void kernel_power_off(void); extern void kernel_power_off(void);

6
kernel/kexec.c
View file

@ -1472,11 +1472,7 @@ int kernel_kexec(void)
} else } else
#endif #endif
{ {
blocking_notifier_call_chain(&reboot_notifier_list, kernel_restart_prepare(NULL);
SYS_RESTART, NULL);
system_state = SYSTEM_RESTART;
device_shutdown();
sysdev_shutdown();
printk(KERN_EMERG "Starting new kernel\n"); printk(KERN_EMERG "Starting new kernel\n");
machine_shutdown(); machine_shutdown();
} }

2
kernel/sys.c
View file

@ -274,7 +274,7 @@ void emergency_restart(void)
} }
EXPORT_SYMBOL_GPL(emergency_restart); 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); blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd);
system_state = SYSTEM_RESTART; system_state = SYSTEM_RESTART;