x86, xsave: keep the XSAVE feature mask as an u64

[linux-2.6-omap-h63xx.git] / include / asm-mips / compat.h

diff --git a/include/asm-mips/compat.h b/include/asm-mips/compat.h
index 55a0152feb08c01246b8a58387a1f0eea0826670..ac5d541368e934a30ca17ac03e58bd990b9eb7ca 100644 (file)
--- a/include/asm-mips/compat.h
+++ b/include/asm-mips/compat.h
@@ -5,6 +5,7 @@
  */
 #include <linux/types.h>
 #include <asm/page.h>
+#include <asm/ptrace.h>
 
 #define COMPAT_USER_HZ 100
 
@@ -36,8 +37,10 @@ typedef s32          compat_key_t;
 
 typedef s32            compat_int_t;
 typedef s32            compat_long_t;
+typedef s64            compat_s64;
 typedef u32            compat_uint_t;
 typedef u32            compat_ulong_t;
+typedef u64            compat_u64;
 
 struct compat_timespec {
        compat_time_t   tv_sec;
@@ -125,13 +128,14 @@ typedef u32               compat_sigset_word;
  * A pointer passed in from user mode. This should not
  * be used for syscall parameters, just declare them
  * as pointers because the syscall entry code will have
- * appropriately comverted them already.
+ * appropriately converted them already.
  */
 typedef u32            compat_uptr_t;
 
 static inline void __user *compat_ptr(compat_uptr_t uptr)
 {
-       return (void __user *)(long)uptr;
+       /* cast to a __user pointer via "unsigned long" makes sparse happy */
+       return (void __user *)(unsigned long)(long)uptr;
 }
 
 static inline compat_uptr_t ptr_to_compat(void __user *uptr)