diff --git a/[refs] b/[refs] index 461e0518504c..43eb6708dd07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d19742fb1c68e6db83b76e06dea5a374c99e104f +refs/heads/master: 748879776e3b738d53e64df6dbec7394b829462a diff --git a/trunk/include/net/compat.h b/trunk/include/net/compat.h index 9679f05e9896..3c7d4e38fa1d 100644 --- a/trunk/include/net/compat.h +++ b/trunk/include/net/compat.h @@ -33,7 +33,11 @@ extern int compat_sock_get_timestamp(struct sock *, struct timeval __user *); extern int compat_sock_get_timestampns(struct sock *, struct timespec __user *); #else /* defined(CONFIG_COMPAT) */ -#define compat_msghdr msghdr /* to avoid compiler warnings */ +/* + * To avoid compiler warnings: + */ +#define compat_msghdr msghdr +#define compat_mmsghdr mmsghdr #endif /* defined(CONFIG_COMPAT) */ extern int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *);