upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / mips / kernel / ptrace32.c

diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c
index 799919d..eee2079 100644 (file)
--- a/arch/mips/kernel/ptrace32.c
+++ b/arch/mips/kernel/ptrace32.c
@@ -24,6 +24,7 @@
 #include <linux/smp_lock.h>
 #include <linux/user.h>
 #include <linux/security.h>
+#include <linux/signal.h>
 
 #include <asm/cpu.h>
 #include <asm/fpu.h>
@@ -112,7 +113,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
                        tmp = regs->regs[addr];
                        break;
                case FPR_BASE ... FPR_BASE + 31:
-                       if (child->used_math) {
+                       if (tsk_used_math(child)) {
                                fpureg_t *fregs = get_fpu_regs(child);
 
                                /*
@@ -193,7 +194,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
                case FPR_BASE ... FPR_BASE + 31: {
                        fpureg_t *fregs = get_fpu_regs(child);
 
-                       if (!child->used_math) {
+                       if (!tsk_used_math(child)) {
                                /* FP not yet used  */
                                memset(&child->thread.fpu.hard, ~0,
                                       sizeof(child->thread.fpu.hard));
@@ -241,7 +242,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
        case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
        case PTRACE_CONT: { /* restart after signal. */
                ret = -EIO;
-               if ((unsigned int) data > _NSIG)
+               if (!valid_signal(data))
                        break;
                if (request == PTRACE_SYSCALL) {
                        set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);