vserver 1.9.5.x5

[linux-2.6.git] / arch / sh / kernel / ptrace.c

diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c
index 732afae..bdb3c4e 100644 (file)
--- a/arch/sh/kernel/ptrace.c
+++ b/arch/sh/kernel/ptrace.c
@@ -1,4 +1,4 @@
-/* $Id: ptrace.c,v 1.14 2003/11/28 23:05:43 kkojima Exp $
+/* $Id: ptrace.c,v 1.15 2004/05/07 05:32:05 sugioka Exp $
  *
  * linux/arch/sh/kernel/ptrace.c
  *
@@ -152,7 +152,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
                        tmp = get_stack_long(child, addr);
                else if (addr >= (long) &dummy->fpu &&
                         addr < (long) &dummy->u_fpvalid) {
-                       if (!child->used_math) {
+                       if (!tsk_used_math(child)) {
                                if (addr == (long)&dummy->fpu.fpscr)
                                        tmp = FPSCR_INIT;
                                else
@@ -161,7 +161,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
                                tmp = ((long *)&child->thread.fpu)
                                        [(addr - (long)&dummy->fpu) >> 2];
                } else if (addr == (long) &dummy->u_fpvalid)
-                       tmp = child->used_math;
+                       tmp = !!tsk_used_math(child);
                else
                        tmp = 0;
                ret = put_user(tmp, (unsigned long *)data);
@@ -187,12 +187,12 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
                        ret = put_stack_long(child, addr, data);
                else if (addr >= (long) &dummy->fpu &&
                         addr < (long) &dummy->u_fpvalid) {
-                       child->used_math = 1;
+                       set_stopped_child_used_math(child);
                        ((long *)&child->thread.fpu)
                                [(addr - (long)&dummy->fpu) >> 2] = data;
                        ret = 0;
                } else if (addr == (long) &dummy->u_fpvalid) {
-                       child->used_math = data?1:0;
+                       conditional_stopped_child_used_math(data, child);
                        ret = 0;
                }
                break;
@@ -219,7 +219,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
  */
        case PTRACE_KILL: {
                ret = 0;
-               if (child->state == TASK_ZOMBIE)        /* already dead */
+               if (child->exit_state == EXIT_ZOMBIE)   /* already dead */
                        break;
                child->exit_code = SIGKILL;
                wake_up_process(child);
@@ -257,13 +257,6 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
                ret = ptrace_detach(child, data);
                break;
 
-       case PTRACE_SETOPTIONS:
-               if (data & PTRACE_O_TRACESYSGOOD)
-                       child->ptrace |= PT_TRACESYSGOOD;
-               else
-                       child->ptrace &= ~PT_TRACESYSGOOD;
-               ret = 0;
-               break;
 #ifdef CONFIG_SH_DSP
        case PTRACE_GETDSPREGS: {
                unsigned long dp;