---

yaml --- r: 3261 b: refs/heads/master c: 026549d h: refs/heads/master i: 3259: 986dee3 v: v3
git-mirror · Jun 25, 2005 · 7e88216 · 7e88216
1 parent 64f2aa7
commit 7e88216
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6f4e3cf75538a75ee4fab620e3c8466f2154458
+refs/heads/master: 026549d28469f7d4ca7e5a4707f0d2dc4f2c164c
diff --git a/trunk/arch/um/kernel/main.c b/trunk/arch/um/kernel/main.c
@@ -69,7 +69,6 @@ static __init void do_uml_initcalls(void)
 
 static void last_ditch_exit(int sig)
 {
-        kmalloc_ok = 0;
 	signal(SIGINT, SIG_DFL);
 	signal(SIGTERM, SIG_DFL);
 	signal(SIGHUP, SIG_DFL);

diff --git a/trunk/arch/um/kernel/reboot.c b/trunk/arch/um/kernel/reboot.c
@@ -38,23 +38,22 @@ static void kill_off_processes(void)
 
 void uml_cleanup(void)
 {
-	kill_off_processes();
+        kmalloc_ok = 0;
 	do_uml_exitcalls();
+	kill_off_processes();
 }
 
 void machine_restart(char * __unused)
 {
-	do_uml_exitcalls();
-	kill_off_processes();
+        uml_cleanup();
 	CHOOSE_MODE(reboot_tt(), reboot_skas());
 }
 
 EXPORT_SYMBOL(machine_restart);
 
 void machine_power_off(void)
 {
-	do_uml_exitcalls();
-	kill_off_processes();
+        uml_cleanup();
 	CHOOSE_MODE(halt_tt(), halt_skas());
 }