Merge tag 'v4.4.214' into 10

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / sparc / include / uapi / asm / ipcbuf.h

diff --git a/arch/sparc/include/uapi/asm/ipcbuf.h b/arch/sparc/include/uapi/asm/ipcbuf.h
index 66013b4..58da9c4 100644 (file)
--- a/arch/sparc/include/uapi/asm/ipcbuf.h
+++ b/arch/sparc/include/uapi/asm/ipcbuf.h
@@ -14,19 +14,19 @@
 
 struct ipc64_perm
 {
-       __kernel_key_t  key;
-       __kernel_uid_t  uid;
-       __kernel_gid_t  gid;
-       __kernel_uid_t  cuid;
-       __kernel_gid_t  cgid;
+       __kernel_key_t          key;
+       __kernel_uid32_t        uid;
+       __kernel_gid32_t        gid;
+       __kernel_uid32_t        cuid;
+       __kernel_gid32_t        cgid;
 #ifndef __arch64__
-       unsigned short  __pad0;
+       unsigned short          __pad0;
 #endif
-       __kernel_mode_t mode;
-       unsigned short  __pad1;
-       unsigned short  seq;
-       unsigned long long __unused1;
-       unsigned long long __unused2;
+       __kernel_mode_t         mode;
+       unsigned short          __pad1;
+       unsigned short          seq;
+       unsigned long long      __unused1;
+       unsigned long long      __unused2;
 };
 
 #endif /* __SPARC_IPCBUF_H */