Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[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 78675f19440fd677cb416fac5bd3067867f0b740..c99166eadbde15bb32a6086f224ba3b083acb7a7 100644 (file)
--- a/arch/mips/include/asm/compat.h
+++ b/arch/mips/include/asm/compat.h
@@ -9,43 +9,25 @@
 #include <asm/page.h>
 #include <asm/ptrace.h>
 
+#include <asm-generic/compat.h>
+
 #define COMPAT_USER_HZ         100
 #define COMPAT_UTS_MACHINE     "mips\0\0\0"
 
-typedef u32            compat_size_t;
-typedef s32            compat_ssize_t;
-typedef s32            compat_clock_t;
-typedef s32            compat_suseconds_t;
-
-typedef s32            compat_pid_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;
 typedef u32            compat_mode_t;
-typedef u32            compat_ino_t;
 typedef u32            compat_dev_t;
-typedef s32            compat_off_t;
-typedef s64            compat_loff_t;
 typedef u32            compat_nlink_t;
 typedef s32            compat_ipc_pid_t;
-typedef s32            compat_daddr_t;
 typedef s32            compat_caddr_t;
 typedef struct {
        s32     val[2];
 } compat_fsid_t;
-typedef s32            compat_timer_t;
-typedef s32            compat_key_t;
-
-typedef s16            compat_short_t;
-typedef s32            compat_int_t;
-typedef s32            compat_long_t;
 typedef s64            compat_s64;
-typedef u16            compat_ushort_t;
-typedef u32            compat_uint_t;
-typedef u32            compat_ulong_t;
 typedef u64            compat_u64;
-typedef u32            compat_uptr_t;
 
 struct compat_stat {
        compat_dev_t    st_dev;
@@ -59,11 +41,11 @@ struct compat_stat {
        s32             st_pad2[2];
        compat_off_t    st_size;
        s32             st_pad3;
-       compat_time_t   st_atime;
+       old_time32_t    st_atime;
        s32             st_atime_nsec;
-       compat_time_t   st_mtime;
+       old_time32_t    st_mtime;
        s32             st_mtime_nsec;
-       compat_time_t   st_ctime;
+       old_time32_t    st_ctime;
        s32             st_ctime_nsec;
        s32             st_blksize;
        s32             st_blocks;