Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

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

diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index 676e868..8150f07 100644 (file)
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -13,7 +13,6 @@
 #include <linux/smp_lock.h>
 #include <linux/time.h>
 #include <linux/ptrace.h>
-#include <linux/resource.h>
 
 #include <asm/ptrace.h>
 #include <asm/uaccess.h>
@@ -261,7 +260,7 @@ irix_sigreturn(struct pt_regs *regs)
 
                for(i = 0; i < 32; i++)
                        error |= __get_user(fregs[i], &context->fpregs[i]);
-               error |= __get_user(current->thread.fpu.fcr31, &context->fpcsr);
+               error |= __get_user(current->thread.fpu.hard.fcr31, &context->fpcsr);
        }
 
        /* XXX do sigstack crapola here... XXX */
@@ -541,6 +540,8 @@ out:
 #define IRIX_P_PGID   2
 #define IRIX_P_ALL    7
 
+extern int getrusage(struct task_struct *, int, struct rusage __user *);
+
 #define W_EXITED     1
 #define W_TRAPPED    2
 #define W_STOPPED    4