Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[karo-tx-linux.git] / arch / um / kernel / reboot.c

diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c
index ced8903921aeb61a255edde5f69cb86a98a2b70e..9bdf67a092a53bc9b9f68939abce7cc872e2a8b6 100644 (file)
--- a/arch/um/kernel/reboot.c
+++ b/arch/um/kernel/reboot.c
@@ -15,28 +15,21 @@ void (*pm_power_off)(void);
 
 static void kill_off_processes(void)
 {
-       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;
-
-               read_lock(&tasklist_lock);
-               for_each_process(p) {
-                       struct task_struct *t;
-
-                       t = find_lock_task_mm(p);
-                       if (!t)
-                               continue;
-                       pid = t->mm->context.id.u.pid;
-                       task_unlock(t);
-                       os_kill_ptraced_process(pid, 1);
-               }
-               read_unlock(&tasklist_lock);
+       struct task_struct *p;
+       int pid;
+
+       read_lock(&tasklist_lock);
+       for_each_process(p) {
+               struct task_struct *t;
+
+               t = find_lock_task_mm(p);
+               if (!t)
+                       continue;
+               pid = t->mm->context.id.u.pid;
+               task_unlock(t);
+               os_kill_ptraced_process(pid, 1);
        }
+       read_unlock(&tasklist_lock);
 }
 
 void uml_cleanup(void)