1 files changed, 10 insertions, 10 deletions

diff --git a/include/asm-x86_64/compat.h b/include/asm-x86_64/compat.h
index d0f453c5adfc..f0155c38f639 100644
--- a/include/asm-x86_64/compat.h
+++ b/include/asm-x86_64/compat.h
@@ -14,10 +14,10 @@ typedef s32		compat_ssize_t;
 typedef s32             compat_time_t;
 typedef s32             compat_clock_t;
 typedef s32             compat_pid_t;
-typedef u16             compat_uid_t;
-typedef u16             compat_gid_t;
-typedef u32             compat_uid32_t;
-typedef u32             compat_gid32_t;
+typedef u16             __compat_uid_t;
+typedef u16             __compat_gid_t;
+typedef u32             __compat_uid32_t;
+typedef u32             __compat_gid32_t;
 typedef u16             compat_mode_t;
 typedef u32             compat_ino_t;
 typedef u16             compat_dev_t;
@@ -52,8 +52,8 @@ struct compat_stat {
         compat_ino_t    st_ino;
         compat_mode_t   st_mode;
         compat_nlink_t  st_nlink;
-        compat_uid_t    st_uid;
-        compat_gid_t    st_gid;
+        __compat_uid_t  st_uid;
+        __compat_gid_t  st_gid;
         compat_dev_t    st_rdev;
         u16             __pad2;
         u32             st_size;
@@ -122,10 +122,10 @@ typedef u32               compat_sigset_word;
 
 struct compat_ipc64_perm {
         compat_key_t key;
-        compat_uid32_t uid;
-        compat_gid32_t gid;
-        compat_uid32_t cuid;
-        compat_gid32_t cgid;
+        __compat_uid32_t uid;
+        __compat_gid32_t gid;
+        __compat_uid32_t cuid;
+        __compat_gid32_t cgid;
         unsigned short mode;
         unsigned short __pad1;
         unsigned short seq;