From 7e88216c1636d4e8c565f9bf632cce710f304274 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Sat, 25 Jun 2005 14:55:23 -0700 Subject: [PATCH] --- yaml --- r: 3261 b: refs/heads/master c: 026549d28469f7d4ca7e5a4707f0d2dc4f2c164c h: refs/heads/master i: 3259: 986dee3daa5fd725e153160d3307b100bdf65467 v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/main.c | 1 - trunk/arch/um/kernel/reboot.c | 9 ++++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 988b0172ba56..4bdec86d47a7 100644 --- 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 index e59f58152678..1e1a87f1c510 100644 --- 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 index 207f89d74908..fcec51da1d37 100644 --- a/trunk/arch/um/kernel/reboot.c +++ b/trunk/arch/um/kernel/reboot.c @@ -38,14 +38,14 @@ 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()); } @@ -53,8 +53,7 @@ EXPORT_SYMBOL(machine_restart); void machine_power_off(void) { - do_uml_exitcalls(); - kill_off_processes(); + uml_cleanup(); CHOOSE_MODE(halt_tt(), halt_skas()); }