---

yaml --- r: 108471 b: refs/heads/master c: ca195b7 h: refs/heads/master i: 108469: 57a181a 108467: 49977a6 108463: 380bbd2 v: v3
git-mirror · Aug 15, 2008 · 95e80fe · 95e80fe
1 parent faeb5aa
commit 95e80fe
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb45daa69d287b394eca1619b3fadff7c0215c71
+refs/heads/master: ca195b7f6da3d5dde0bb85a7c322d7de73352653
diff --git a/trunk/include/linux/reboot.h b/trunk/include/linux/reboot.h
@@ -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);

diff --git a/trunk/kernel/kexec.c b/trunk/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 --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
@@ -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;