Merge tag 'for_v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

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

diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h
index cee28a05ee98f0a63dabac43b939f46e457214a6..93ce86d5dae136140280b01f7da80260a41849a9 100644 (file)
--- a/arch/arm64/include/asm/compat.h
+++ b/arch/arm64/include/asm/compat.h
@@ -25,6 +25,8 @@
 #include <linux/sched.h>
 #include <linux/sched/task_stack.h>
 
+#include <asm-generic/compat.h>
+
 #define COMPAT_USER_HZ         100
 #ifdef __AARCH64EB__
 #define COMPAT_UTS_MACHINE     "armv8b\0\0"
@@ -32,10 +34,6 @@
 #define COMPAT_UTS_MACHINE     "armv8l\0\0"
 #endif
 
-typedef u32            compat_size_t;
-typedef s32            compat_ssize_t;
-typedef s32            compat_clock_t;
-typedef s32            compat_pid_t;
 typedef u16            __compat_uid_t;
 typedef u16            __compat_gid_t;
 typedef u16            __compat_uid16_t;
@@ -43,27 +41,13 @@ typedef u16         __compat_gid16_t;
 typedef u32            __compat_uid32_t;
 typedef u32            __compat_gid32_t;
 typedef u16            compat_mode_t;
-typedef u32            compat_ino_t;
 typedef u32            compat_dev_t;
-typedef s32            compat_off_t;
-typedef s64            compat_loff_t;
 typedef s32            compat_nlink_t;
 typedef u16            compat_ipc_pid_t;
-typedef s32            compat_daddr_t;
 typedef u32            compat_caddr_t;
 typedef __kernel_fsid_t        compat_fsid_t;
-typedef s32            compat_key_t;
-typedef s32            compat_timer_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 {
 #ifdef __AARCH64EB__
@@ -86,11 +70,11 @@ struct compat_stat {
        compat_off_t    st_size;
        compat_off_t    st_blksize;
        compat_off_t    st_blocks;
-       compat_time_t   st_atime;
+       old_time32_t    st_atime;
        compat_ulong_t  st_atime_nsec;
-       compat_time_t   st_mtime;
+       old_time32_t    st_mtime;
        compat_ulong_t  st_mtime_nsec;
-       compat_time_t   st_ctime;
+       old_time32_t    st_ctime;
        compat_ulong_t  st_ctime_nsec;
        compat_ulong_t  __unused4[2];
 };