X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-mips%2Fcompat.h;h=568c76cdd9000aed94b2d7970bbfdb2f446d6973;hb=a5ccfe5c1a48bff1e47788d470ee50974f7dd33d;hp=432653d7ae09326dafde8ef0b23504ca27b69300;hpb=40b20c257a13c5a526ac540bc5e43d0fdf29792a;p=linux-2.6

diff --git a/include/asm-mips/compat.h b/include/asm-mips/compat.h
index 432653d7ae..568c76cdd9 100644
--- a/include/asm-mips/compat.h
+++ b/include/asm-mips/compat.h
@@ -37,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;
@@ -132,7 +134,8 @@ 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)