Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / include / asm-mips / compat-signal.h

diff --git a/include/asm-mips/compat-signal.h b/include/asm-mips/compat-signal.h
index 672077084aa1ffc12fe2cb2f943d1e1f1015828e..6599a901b63ea20733ad9decf8bbebcc7ee8d8bd 100644 (file)
--- a/include/asm-mips/compat-signal.h
+++ b/include/asm-mips/compat-signal.h
@@ -5,6 +5,11 @@
 #include <linux/compat.h>
 #include <linux/compiler.h>
 
+#include <asm/signal.h>
+#include <asm/siginfo.h>
+
+#include <asm/uaccess.h>
+
 static inline int __copy_conv_sigset_to_user(compat_sigset_t __user *d,
        const sigset_t *s)
 {
@@ -33,9 +38,6 @@ static inline int __copy_conv_sigset_from_user(sigset_t *d,
        BUG_ON(sizeof(*d) != sizeof(*s));
        BUG_ON(_NSIG_WORDS != 2);
 
-       if (unlikely(!access_ok(VERIFY_READ, d, sizeof(*d))))
-               return -EFAULT;
-
 #ifdef CONFIG_CPU_BIG_ENDIAN
        err  = __get_user(u->c.sig[1], &s->sig[0]);
        err |= __get_user(u->c.sig[0], &s->sig[1]);