Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / arch / um / kernel / reboot.c

diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c
index 3ef73bf..00197d3 100644 (file)
--- a/arch/um/kernel/reboot.c
+++ b/arch/um/kernel/reboot.c
@@ -1,75 +1,57 @@
 /* 
- * Copyright (C) 2000, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include "linux/module.h"
 #include "linux/sched.h"
-#include "asm/smp.h"
-#include "user_util.h"
 #include "kern_util.h"
-#include "kern.h"
 #include "os.h"
-#include "mode.h"
-#include "choose-mode.h"
+#include "skas.h"
 
 void (*pm_power_off)(void);
 
-#ifdef CONFIG_SMP
-static void kill_idlers(int me)
-{
-#ifdef CONFIG_MODE_TT
-       struct task_struct *p;
-       int i;
-
-       for(i = 0; i < sizeof(idle_threads)/sizeof(idle_threads[0]); i++){
-               p = idle_threads[i];
-               if((p != NULL) && (p->thread.mode.tt.extern_pid != me))
-                       os_kill_process(p->thread.mode.tt.extern_pid, 0);
-       }
-#endif
-}
-#endif
-
 static void kill_off_processes(void)
 {
-       CHOOSE_MODE(kill_off_processes_tt(), kill_off_processes_skas());
-#ifdef CONFIG_SMP
-       kill_idlers(os_getpid());
-#endif
+       if (proc_mm)
+               /*
+                * FIXME: need to loop over userspace_pids
+                */
+               os_kill_ptraced_process(userspace_pid[0], 1);
+       else {
+               struct task_struct *p;
+               int pid, me;
+
+               me = os_getpid();
+               for_each_process(p) {
+                       if (p->mm == NULL)
+                               continue;
+
+                       pid = p->mm->context.id.u.pid;
+                       os_kill_ptraced_process(pid, 1);
+               }
+       }
 }
 
 void uml_cleanup(void)
 {
-        kmalloc_ok = 0;
+       kmalloc_ok = 0;
        do_uml_exitcalls();
        kill_off_processes();
 }
 
 void machine_restart(char * __unused)
 {
-        uml_cleanup();
-       CHOOSE_MODE(reboot_tt(), reboot_skas());
+       uml_cleanup();
+       reboot_skas();
 }
 
 void machine_power_off(void)
 {
-        uml_cleanup();
-       CHOOSE_MODE(halt_tt(), halt_skas());
+       uml_cleanup();
+       halt_skas();
 }
 
 void machine_halt(void)
 {
        machine_power_off();
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */