Merge tag 'drm-intel-fixes-2014-02-11' of ssh://git.freedesktop.org/git/drm-intel...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / uapi / asm-generic / ipcbuf.h

diff --git a/include/uapi/asm-generic/ipcbuf.h b/include/uapi/asm-generic/ipcbuf.h
index 76982b2..3dbcc1e 100644 (file)
--- a/include/uapi/asm-generic/ipcbuf.h
+++ b/include/uapi/asm-generic/ipcbuf.h
@@ -27,8 +27,8 @@ struct ipc64_perm {
        unsigned char           __pad1[4 - sizeof(__kernel_mode_t)];
        unsigned short          seq;
        unsigned short          __pad2;
-       unsigned long           __unused1;
-       unsigned long           __unused2;
+       __kernel_ulong_t        __unused1;
+       __kernel_ulong_t        __unused2;
 };
 
 #endif /* __ASM_GENERIC_IPCBUF_H */