asm-generic: compat: Cleanup duplicate definitions

[sfrench/cifs-2.6.git] / arch / mips / include / asm / compat.h

diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h
index 6d6e5a451f4d9f1a940f77acb06e1c300ac9cd07..ec01dc000a418bb54865b1e0b7597f57995b7f29 100644 (file)
--- a/arch/mips/include/asm/compat.h
+++ b/arch/mips/include/asm/compat.h
@@ -9,28 +9,28 @@
 #include <asm/page.h>
 #include <asm/ptrace.h>
 
+#define __compat_uid_t __compat_uid_t
 typedef s32            __compat_uid_t;
 typedef s32            __compat_gid_t;
+
 typedef __compat_uid_t __compat_uid32_t;
 typedef __compat_gid_t __compat_gid32_t;
 #define __compat_uid32_t __compat_uid32_t
-#define __compat_gid32_t __compat_gid32_t
+
+#define compat_statfs          compat_statfs
+#define compat_ipc64_perm      compat_ipc64_perm
 
 #define _COMPAT_NSIG           128             /* Don't ask !$@#% ...  */
 #define _COMPAT_NSIG_BPW       32
 typedef u32            compat_sigset_word;
 
+#define COMPAT_RLIM_INFINITY   0x7fffffffUL
+
 #include <asm-generic/compat.h>
 
-#define COMPAT_USER_HZ         100
 #define COMPAT_UTS_MACHINE     "mips\0\0\0"
 
-typedef u32            compat_dev_t;
 typedef u32            compat_nlink_t;
-typedef s32            compat_ipc_pid_t;
-typedef struct {
-       s32     val[2];
-} compat_fsid_t;
 
 struct compat_stat {
        compat_dev_t    st_dev;
@@ -73,10 +73,6 @@ struct compat_statfs {
        int             f_spare[5];
 };
 
-#define COMPAT_RLIM_INFINITY   0x7fffffffUL
-
-#define COMPAT_OFF_T_MAX       0x7fffffff
-
 struct compat_ipc64_perm {
        compat_key_t key;
        __compat_uid32_t uid;