diff options
| -rw-r--r-- | include/asm-parisc/compat.h | 5 | ||||
| -rw-r--r-- | include/asm-ppc64/compat.h | 5 | ||||
| -rw-r--r-- | include/asm-s390x/compat.h | 5 | ||||
| -rw-r--r-- | include/asm-sparc64/compat.h | 5 | ||||
| -rw-r--r-- | include/asm-x86_64/compat.h | 5 | ||||
| -rw-r--r-- | include/net/compat.h | 14 |
6 files changed, 32 insertions, 7 deletions
diff --git a/include/asm-parisc/compat.h b/include/asm-parisc/compat.h index 86cb0684e4a0..2940a9757a64 100644 --- a/include/asm-parisc/compat.h +++ b/include/asm-parisc/compat.h @@ -24,6 +24,11 @@ typedef u16 compat_ipc_pid_t; typedef s32 compat_daddr_t; typedef u32 compat_caddr_t; +typedef s32 compat_int_t; +typedef s32 compat_long_t; +typedef u32 compat_uint_t; +typedef u32 compat_ulong_t; + struct compat_timespec { compat_time_t tv_sec; s32 tv_nsec; diff --git a/include/asm-ppc64/compat.h b/include/asm-ppc64/compat.h index 2929e0ca4e22..4934e9315e76 100644 --- a/include/asm-ppc64/compat.h +++ b/include/asm-ppc64/compat.h @@ -25,6 +25,11 @@ typedef s32 compat_daddr_t; typedef u32 compat_caddr_t; typedef __kernel_fsid_t compat_fsid_t; +typedef s32 compat_int_t; +typedef s32 compat_long_t; +typedef u32 compat_uint_t; +typedef u32 compat_ulong_t; + struct compat_timespec { compat_time_t tv_sec; s32 tv_nsec; diff --git a/include/asm-s390x/compat.h b/include/asm-s390x/compat.h index b86ee23ac495..55966b41d290 100644 --- a/include/asm-s390x/compat.h +++ b/include/asm-s390x/compat.h @@ -25,6 +25,11 @@ typedef s32 compat_daddr_t; typedef u32 compat_caddr_t; typedef __kernel_fsid_t compat_fsid_t; +typedef s32 compat_int_t; +typedef s32 compat_long_t; +typedef u32 compat_uint_t; +typedef u32 compat_ulong_t; + struct compat_timespec { compat_time_t tv_sec; s32 tv_nsec; diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h index d4f9d3b8882b..dc174a7ef925 100644 --- a/include/asm-sparc64/compat.h +++ b/include/asm-sparc64/compat.h @@ -25,6 +25,11 @@ typedef s32 compat_daddr_t; typedef u32 compat_caddr_t; typedef __kernel_fsid_t compat_fsid_t; +typedef s32 compat_int_t; +typedef s32 compat_long_t; +typedef u32 compat_uint_t; +typedef u32 compat_ulong_t; + struct compat_timespec { compat_time_t tv_sec; s32 tv_nsec; diff --git a/include/asm-x86_64/compat.h b/include/asm-x86_64/compat.h index b6e5eac81402..06c27d32eae5 100644 --- a/include/asm-x86_64/compat.h +++ b/include/asm-x86_64/compat.h @@ -27,6 +27,11 @@ typedef s32 compat_daddr_t; typedef u32 compat_caddr_t; typedef __kernel_fsid_t compat_fsid_t; +typedef s32 compat_int_t; +typedef s32 compat_long_t; +typedef u32 compat_uint_t; +typedef u32 compat_ulong_t; + struct compat_timespec { compat_time_t tv_sec; s32 tv_nsec; diff --git a/include/net/compat.h b/include/net/compat.h index 2a72d0cbfd14..461e1a725797 100644 --- a/include/net/compat.h +++ b/include/net/compat.h @@ -8,19 +8,19 @@ #include <linux/compat.h> struct compat_msghdr { - compat_uptr_t msg_name; - s32 msg_namelen; - compat_uptr_t msg_iov; + compat_uptr_t msg_name; /* void * */ + compat_int_t msg_namelen; + compat_uptr_t msg_iov; /* struct compat_iovec * */ compat_size_t msg_iovlen; - compat_uptr_t msg_control; + compat_uptr_t msg_control; /* void * */ compat_size_t msg_controllen; - u32 msg_flags; + compat_uint_t msg_flags; }; struct compat_cmsghdr { compat_size_t cmsg_len; - s32 cmsg_level; - s32 cmsg_type; + compat_int_t cmsg_level; + compat_int_t cmsg_type; }; #else /* defined(CONFIG_COMPAT) */ |