mmc: s3c6410: enable ADMA feature in 6410 sdhci controller

[safe/jmp/linux-2.6] / net / compat.c

diff --git a/net/compat.c b/net/compat.c
index c4d9131..ec24d9e 100644 (file)
--- a/net/compat.c
+++ b/net/compat.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/gfp.h>
 #include <linux/fs.h>
 #include <linux/types.h>
 #include <linux/file.h>
@@ -763,15 +764,12 @@ asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
                return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
                                      flags | MSG_CMSG_COMPAT, NULL);
 
-       if (get_user(ktspec.tv_sec, &timeout->tv_sec) ||
-           get_user(ktspec.tv_nsec, &timeout->tv_nsec))
+       if (get_compat_timespec(&ktspec, timeout))
                return -EFAULT;
 
        datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
                                   flags | MSG_CMSG_COMPAT, &ktspec);
-       if (datagrams > 0 &&
-           (put_user(ktspec.tv_sec, &timeout->tv_sec) ||
-            put_user(ktspec.tv_nsec, &timeout->tv_nsec)))
+       if (datagrams > 0 && put_compat_timespec(&ktspec, timeout))
                datagrams = -EFAULT;
 
        return datagrams;