Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x32 support for x86-64 from Ingo Molnar:
 "This tree introduces the X32 binary format and execution mode for x86:
  32-bit data space binaries using 64-bit instructions and 64-bit kernel
  syscalls.

  This allows applications whose working set fits into a 32 bits address
  space to make use of 64-bit instructions while using a 32-bit address
  space with shorter pointers, more compressed data structures, etc."

Fix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c}

* 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)
  x32: Fix alignment fail in struct compat_siginfo
  x32: Fix stupid ia32/x32 inversion in the siginfo format
  x32: Add ptrace for x32
  x32: Switch to a 64-bit clock_t
  x32: Provide separate is_ia32_task() and is_x32_task() predicates
  x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls
  x86/x32: Fix the binutils auto-detect
  x32: Warn and disable rather than error if binutils too old
  x32: Only clear TIF_X32 flag once
  x32: Make sure TS_COMPAT is cleared for x32 tasks
  fs: Remove missed ->fds_bits from cessation use of fd_set structs internally
  fs: Fix close_on_exec pointer in alloc_fdtable
  x32: Drop non-__vdso weak symbols from the x32 VDSO
  x32: Fix coding style violations in the x32 VDSO code
  x32: Add x32 VDSO support
  x32: Allow x32 to be configured
  x32: If configured, add x32 system calls to system call tables
  x32: Handle process creation
  x32: Signal-related system calls
  x86: Add #ifdef CONFIG_COMPAT to <asm/sys_ia32.h>
  ...

1 files changed, 40 insertions, 25 deletions

diff --git a/net/compat.c b/net/compat.c
index 64b4515a64e..e055708b8ec 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -219,8 +219,6 @@ Efault:
 
 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
 {
-        struct compat_timeval ctv;
-        struct compat_timespec cts[3];
         struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
         struct compat_cmsghdr cmhdr;
         int cmlen;
@@ -230,24 +228,28 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
                 return 0; /* XXX: return error? check spec. */
         }
 
-        if (level == SOL_SOCKET && type == SCM_TIMESTAMP) {
-                struct timeval *tv = (struct timeval *)data;
-                ctv.tv_sec = tv->tv_sec;
-                ctv.tv_usec = tv->tv_usec;
-                data = &ctv;
-                len = sizeof(ctv);
-        }
-        if (level == SOL_SOCKET &&
-            (type == SCM_TIMESTAMPNS || type == SCM_TIMESTAMPING)) {
-                int count = type == SCM_TIMESTAMPNS ? 1 : 3;
-                int i;
-                struct timespec *ts = (struct timespec *)data;
-                for (i = 0; i < count; i++) {
-                        cts[i].tv_sec = ts[i].tv_sec;
-                        cts[i].tv_nsec = ts[i].tv_nsec;
+        if (!COMPAT_USE_64BIT_TIME) {
+                struct compat_timeval ctv;
+                struct compat_timespec cts[3];
+                if (level == SOL_SOCKET && type == SCM_TIMESTAMP) {
+                        struct timeval *tv = (struct timeval *)data;
+                        ctv.tv_sec = tv->tv_sec;
+                        ctv.tv_usec = tv->tv_usec;
+                        data = &ctv;
+                        len = sizeof(ctv);
+                }
+                if (level == SOL_SOCKET &&
+                    (type == SCM_TIMESTAMPNS || type == SCM_TIMESTAMPING)) {
+                        int count = type == SCM_TIMESTAMPNS ? 1 : 3;
+                        int i;
+                        struct timespec *ts = (struct timespec *)data;
+                        for (i = 0; i < count; i++) {
+                                cts[i].tv_sec = ts[i].tv_sec;
+                                cts[i].tv_nsec = ts[i].tv_nsec;
+                        }
+                        data = &cts;
+                        len = sizeof(cts[0]) * count;
                 }
-                data = &cts;
-                len = sizeof(cts[0]) * count;
         }
 
         cmlen = CMSG_COMPAT_LEN(len);
@@ -454,11 +456,15 @@ static int compat_sock_getsockopt(struct socket *sock, int level, int optname,
 
 int compat_sock_get_timestamp(struct sock *sk, struct timeval __user *userstamp)
 {
-        struct compat_timeval __user *ctv =
-                        (struct compat_timeval __user *) userstamp;
-        int err = -ENOENT;
+        struct compat_timeval __user *ctv;
+        int err;
         struct timeval tv;
 
+        if (COMPAT_USE_64BIT_TIME)
+                return sock_get_timestamp(sk, userstamp);
+
+        ctv = (struct compat_timeval __user *) userstamp;
+        err = -ENOENT;
         if (!sock_flag(sk, SOCK_TIMESTAMP))
                 sock_enable_timestamp(sk, SOCK_TIMESTAMP);
         tv = ktime_to_timeval(sk->sk_stamp);
@@ -478,11 +484,15 @@ EXPORT_SYMBOL(compat_sock_get_timestamp);
 
 int compat_sock_get_timestampns(struct sock *sk, struct timespec __user *userstamp)
 {
-        struct compat_timespec __user *ctv =
-                        (struct compat_timespec __user *) userstamp;
-        int err = -ENOENT;
+        struct compat_timespec __user *ctv;
+        int err;
         struct timespec ts;
 
+        if (COMPAT_USE_64BIT_TIME)
+                return sock_get_timestampns (sk, userstamp);
+
+        ctv = (struct compat_timespec __user *) userstamp;
+        err = -ENOENT;
         if (!sock_flag(sk, SOCK_TIMESTAMP))
                 sock_enable_timestamp(sk, SOCK_TIMESTAMP);
         ts = ktime_to_timespec(sk->sk_stamp);
@@ -767,6 +777,11 @@ asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
         int datagrams;
         struct timespec ktspec;
 
+        if (COMPAT_USE_64BIT_TIME)
+                return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
+                                      flags | MSG_CMSG_COMPAT,
+                                      (struct timespec *) timeout);
+
         if (timeout == NULL)
                 return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen,
                                       flags | MSG_CMSG_COMPAT, NULL);