vserver 1.9.5.x5

[linux-2.6.git] / arch / um / kernel / tt / process_kern.c

diff --git a/arch/um/kernel/tt/process_kern.c b/arch/um/kernel/tt/process_kern.c
index 6224afc..1f4d12b 100644 (file)
--- a/arch/um/kernel/tt/process_kern.c
+++ b/arch/um/kernel/tt/process_kern.c
@@ -65,7 +65,8 @@ void *switch_to_tt(void *prev, void *next, void *last)
                panic("write of switch_pipe failed, err = %d", -err);
 
        reading = 1;
-       if((from->state == TASK_ZOMBIE) || (from->state == TASK_DEAD))
+       if((from->exit_state == EXIT_ZOMBIE) ||
+          (from->exit_state == EXIT_DEAD))
                os_kill_process(os_getpid(), 0);
 
        err = os_read_file(from->thread.mode.tt.switch_pipe[0], &c, sizeof(c));
@@ -80,8 +81,8 @@ void *switch_to_tt(void *prev, void *next, void *last)
         * in case it has not already killed itself.
         */
        prev_sched = current->thread.prev_sched;
-       if((prev_sched->state == TASK_ZOMBIE) ||
-          (prev_sched->state == TASK_DEAD))
+       if((prev_sched->exit_state == EXIT_ZOMBIE) ||
+          (prev_sched->exit_state == EXIT_DEAD))
                os_kill_process(prev_sched->thread.mode.tt.extern_pid, 1);
 
        /* This works around a nasty race with 'jail'.  If we are switching
@@ -305,7 +306,6 @@ int copy_thread_tt(int nr, unsigned long clone_flags, unsigned long sp,
 
        change_sig(SIGUSR1, 0);
        err = 0;
- out:
        return(err);
 }
 
@@ -524,22 +524,6 @@ void set_init_pid(int pid)
                      -err);
 }
 
-int singlestepping_tt(void *t)
-{
-       struct task_struct *task = t;
-
-       if(task->thread.mode.tt.singlestep_syscall)
-               return(0);
-       return(task->ptrace & PT_DTRACE);
-}
-
-void clear_singlestep(void *t)
-{
-       struct task_struct *task = t;
-
-       task->ptrace &= ~PT_DTRACE;
-}
-
 int start_uml_tt(void)
 {
        void *sp;