Merge branch 'x86/x32' into x86/cleanups

Merge reason: We are going to merge a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

43 files changed, 1101 insertions, 601 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5bed94e189fa..e2b38b4bffdc 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2165,9 +2165,9 @@ config IA32_EMULATION
         depends on X86_64
         select COMPAT_BINFMT_ELF
         ---help---
-          Include code to run 32-bit programs under a 64-bit kernel. You should
-          likely turn this on, unless you're 100% sure that you don't have any
-          32-bit programs left.
+          Include code to run legacy 32-bit programs under a
+          64-bit kernel. You should likely turn this on, unless you're
+          100% sure that you don't have any 32-bit programs left.
 
 config IA32_AOUT
         tristate "IA32 a.out support"
@@ -2175,9 +2175,22 @@ config IA32_AOUT
         ---help---
           Support old a.out binaries in the 32bit emulation.
 
+config X86_X32
+        bool "x32 ABI for 64-bit mode (EXPERIMENTAL)"
+        depends on X86_64 && IA32_EMULATION && EXPERIMENTAL
+        ---help---
+          Include code to run binaries for the x32 native 32-bit ABI
+          for 64-bit processors.  An x32 process gets access to the
+          full 64-bit register file and wide data path while leaving
+          pointers at 32 bits for smaller memory footprint.
+
+          You will need a recent binutils (2.22 or later) with
+          elf32_x86_64 support enabled to compile a kernel with this
+          option set.
+
 config COMPAT
         def_bool y
-        depends on IA32_EMULATION
+        depends on IA32_EMULATION || X86_X32
 
 config COMPAT_FOR_U64_ALIGNMENT
         def_bool COMPAT
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 209ba1294592..968dbe24a255 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -82,6 +82,22 @@ ifdef CONFIG_CC_STACKPROTECTOR
         endif
 endif
 
+ifdef CONFIG_X86_X32
+        x32_ld_ok := $(call try-run,\
+                        /bin/echo -e '1: .quad 1b' | \
+                        $(CC) $(KBUILD_AFLAGS) -c -xassembler -o "$$TMP" - && \
+                        $(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMPO" && \
+                        $(LD) -m elf32_x86_64 "$$TMPO" -o "$$TMP",y,n)
+        ifeq ($(x32_ld_ok),y)
+                CONFIG_X86_X32_ABI := y
+                KBUILD_AFLAGS += -DCONFIG_X86_X32_ABI
+                KBUILD_CFLAGS += -DCONFIG_X86_X32_ABI
+        else
+                $(warning CONFIG_X86_X32 enabled but no binutils support)
+        endif
+endif
+export CONFIG_X86_X32_ABI
+
 # Don't unroll struct assignments with kmemcheck enabled
 ifeq ($(CONFIG_KMEMCHECK),y)
         KBUILD_CFLAGS += $(call cc-option,-fno-builtin-memcpy)
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 65577698cab2..bc09ed2a8b97 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -12,10 +12,8 @@
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/kernel.h>
-#include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/wait.h>
-#include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
 #include <linux/personality.h>
@@ -31,20 +29,15 @@
 #include <asm/proto.h>
 #include <asm/vdso.h>
 #include <asm/sigframe.h>
+#include <asm/sighandling.h>
 #include <asm/sys_ia32.h>
 
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-
-#define FIX_EFLAGS      (X86_EFLAGS_AC | X86_EFLAGS_OF | \
-                         X86_EFLAGS_DF | X86_EFLAGS_TF | X86_EFLAGS_SF | \
-                         X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \
-                         X86_EFLAGS_CF)
-
-void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
+#define FIX_EFLAGS      __FIX_EFLAGS
 
 int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
 {
         int err = 0;
+        bool ia32 = !is_ia32_task();
 
         if (!access_ok(VERIFY_WRITE, to, sizeof(compat_siginfo_t)))
                 return -EFAULT;
@@ -74,8 +67,13 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
                         case __SI_FAULT >> 16:
                                 break;
                         case __SI_CHLD >> 16:
-                                put_user_ex(from->si_utime, &to->si_utime);
-                                put_user_ex(from->si_stime, &to->si_stime);
+                                if (ia32) {
+                                        put_user_ex(from->si_utime, &to->si_utime);
+                                        put_user_ex(from->si_stime, &to->si_stime);
+                                } else {
+                                        put_user_ex(from->si_utime, &to->_sifields._sigchld_x32._utime);
+                                        put_user_ex(from->si_stime, &to->_sifields._sigchld_x32._stime);
+                                }
                                 put_user_ex(from->si_status, &to->si_status);
                                 /* FALL THROUGH */
                         default:
diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
index f6f5c53dc903..aec2202a596c 100644
--- a/arch/x86/ia32/sys_ia32.c
+++ b/arch/x86/ia32/sys_ia32.c
@@ -287,46 +287,6 @@ asmlinkage long sys32_sigaction(int sig, struct old_sigaction32 __user *act,
         return ret;
 }
 
-asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
-                                     compat_sigset_t __user *oset,
-                                     unsigned int sigsetsize)
-{
-        sigset_t s;
-        compat_sigset_t s32;
-        int ret;
-        mm_segment_t old_fs = get_fs();
-
-        if (set) {
-                if (copy_from_user(&s32, set, sizeof(compat_sigset_t)))
-                        return -EFAULT;
-                switch (_NSIG_WORDS) {
-                case 4: s.sig[3] = s32.sig[6] | (((long)s32.sig[7]) << 32);
-                case 3: s.sig[2] = s32.sig[4] | (((long)s32.sig[5]) << 32);
-                case 2: s.sig[1] = s32.sig[2] | (((long)s32.sig[3]) << 32);
-                case 1: s.sig[0] = s32.sig[0] | (((long)s32.sig[1]) << 32);
-                }
-        }
-        set_fs(KERNEL_DS);
-        ret = sys_rt_sigprocmask(how,
-                                 set ? (sigset_t __user *)&s : NULL,
-                                 oset ? (sigset_t __user *)&s : NULL,
-                                 sigsetsize);
-        set_fs(old_fs);
-        if (ret)
-                return ret;
-        if (oset) {
-                switch (_NSIG_WORDS) {
-                case 4: s32.sig[7] = (s.sig[3] >> 32); s32.sig[6] = s.sig[3];
-                case 3: s32.sig[5] = (s.sig[2] >> 32); s32.sig[4] = s.sig[2];
-                case 2: s32.sig[3] = (s.sig[1] >> 32); s32.sig[2] = s.sig[1];
-                case 1: s32.sig[1] = (s.sig[0] >> 32); s32.sig[0] = s.sig[0];
-                }
-                if (copy_to_user(oset, &s32, sizeof(compat_sigset_t)))
-                        return -EFAULT;
-        }
-        return 0;
-}
-
 asmlinkage long sys32_alarm(unsigned int seconds)
 {
         return alarm_setitimer(seconds);
diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
index b57e6a43a37a..f9c0d3ba9e84 100644
--- a/arch/x86/include/asm/Kbuild
+++ b/arch/x86/include/asm/Kbuild
@@ -14,6 +14,7 @@ header-y += msr.h
 header-y += mtrr.h
 header-y += posix_types_32.h
 header-y += posix_types_64.h
+header-y += posix_types_x32.h
 header-y += prctl.h
 header-y += processor-flags.h
 header-y += ptrace-abi.h
@@ -24,3 +25,4 @@ header-y += vsyscall.h
 
 genhdr-y += unistd_32.h
 genhdr-y += unistd_64.h
+genhdr-y += unistd_x32.h
diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
index 30d737ef2a42..355edc091604 100644
--- a/arch/x86/include/asm/compat.h
+++ b/arch/x86/include/asm/compat.h
@@ -6,7 +6,9 @@
  */
 #include <linux/types.h>
 #include <linux/sched.h>
+#include <asm/processor.h>
 #include <asm/user32.h>
+#include <asm/unistd.h>
 
 #define COMPAT_USER_HZ          100
 #define COMPAT_UTS_MACHINE      "i686\0\0"
@@ -186,7 +188,20 @@ struct compat_shmid64_ds {
 /*
  * The type of struct elf_prstatus.pr_reg in compatible core dumps.
  */
+#ifdef CONFIG_X86_X32_ABI
+typedef struct user_regs_struct compat_elf_gregset_t;
+
+#define PR_REG_SIZE(S) (test_thread_flag(TIF_IA32) ? 68 : 216)
+#define PRSTATUS_SIZE(S) (test_thread_flag(TIF_IA32) ? 144 : 296)
+#define SET_PR_FPVALID(S,V) \
+  do { *(int *) (((void *) &((S)->pr_reg)) + PR_REG_SIZE(0)) = (V); } \
+  while (0)
+
+#define COMPAT_USE_64BIT_TIME \
+        (!!(task_pt_regs(current)->orig_ax & __X32_SYSCALL_BIT))
+#else
 typedef struct user_regs_struct32 compat_elf_gregset_t;
+#endif
 
 /*
  * A pointer passed in from user mode. This should not
@@ -208,13 +223,39 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
 
 static inline void __user *arch_compat_alloc_user_space(long len)
 {
-        struct pt_regs *regs = task_pt_regs(current);
-        return (void __user *)regs->sp - len;
+        compat_uptr_t sp;
+
+        if (test_thread_flag(TIF_IA32)) {
+                sp = task_pt_regs(current)->sp;
+        } else {
+                /* -128 for the x32 ABI redzone */
+                sp = percpu_read(old_rsp) - 128;
+        }
+
+        return (void __user *)round_down(sp - len, 16);
+}
+
+static inline bool is_ia32_task(void)
+{
+#ifdef CONFIG_IA32_EMULATION
+        if (current_thread_info()->status & TS_COMPAT)
+                return true;
+#endif
+        return false;
+}
+
+static inline bool is_x32_task(void)
+{
+#ifdef CONFIG_X86_X32_ABI
+        if (task_pt_regs(current)->orig_ax & __X32_SYSCALL_BIT)
+                return true;
+#endif
+        return false;
 }
 
-static inline int is_compat_task(void)
+static inline bool is_compat_task(void)
 {
-        return current_thread_info()->status & TS_COMPAT;
+        return is_ia32_task() || is_x32_task();
 }
 
 #endif /* _ASM_X86_COMPAT_H */
diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
index 5f962df30d0f..1e40634591a4 100644
--- a/arch/x86/include/asm/elf.h
+++ b/arch/x86/include/asm/elf.h
@@ -156,7 +156,12 @@ do {						\
 #define elf_check_arch(x)                       \
         ((x)->e_machine == EM_X86_64)
 
-#define compat_elf_check_arch(x)        elf_check_arch_ia32(x)
+#define compat_elf_check_arch(x)                \
+        (elf_check_arch_ia32(x) || (x)->e_machine == EM_X86_64)
+
+#if __USER32_DS != __USER_DS
+# error "The following code assumes __USER32_DS == __USER_DS"
+#endif
 
 static inline void elf_common_init(struct thread_struct *t,
                                    struct pt_regs *regs, const u16 ds)
@@ -179,8 +184,9 @@ static inline void elf_common_init(struct thread_struct *t,
 void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp);
 #define compat_start_thread start_thread_ia32
 
-void set_personality_ia32(void);
-#define COMPAT_SET_PERSONALITY(ex) set_personality_ia32()
+void set_personality_ia32(bool);
+#define COMPAT_SET_PERSONALITY(ex)                      \
+        set_personality_ia32((ex).e_machine == EM_X86_64)
 
 #define COMPAT_ELF_PLATFORM                     ("i686")
 
@@ -287,7 +293,7 @@ do {									\
 #define VDSO_HIGH_BASE          0xffffe000U /* CONFIG_COMPAT_VDSO address */
 
 /* 1GB for 64bit, 8MB for 32bit */
-#define STACK_RND_MASK (test_thread_flag(TIF_IA32) ? 0x7ff : 0x3fffff)
+#define STACK_RND_MASK (test_thread_flag(TIF_ADDR32) ? 0x7ff : 0x3fffff)
 
 #define ARCH_DLINFO                                                     \
 do {                                                                    \
@@ -296,9 +302,20 @@ do {									\
                             (unsigned long)current->mm->context.vdso);  \
 } while (0)
 
+#define ARCH_DLINFO_X32                                                 \
+do {                                                                    \
+        if (vdso_enabled)                                               \
+                NEW_AUX_ENT(AT_SYSINFO_EHDR,                            \
+                            (unsigned long)current->mm->context.vdso);  \
+} while (0)
+
 #define AT_SYSINFO              32
 
-#define COMPAT_ARCH_DLINFO      ARCH_DLINFO_IA32(sysctl_vsyscall32)
+#define COMPAT_ARCH_DLINFO                                              \
+if (test_thread_flag(TIF_X32))                                          \
+        ARCH_DLINFO_X32;                                                \
+else                                                                    \
+        ARCH_DLINFO_IA32(sysctl_vsyscall32)
 
 #define COMPAT_ELF_ET_DYN_BASE  (TASK_UNMAPPED_BASE + 0x1000000)
 
@@ -314,6 +331,8 @@ struct linux_binprm;
 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
                                        int uses_interp);
+extern int x32_setup_additional_pages(struct linux_binprm *bprm,
+                                      int uses_interp);
 
 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
 #define compat_arch_setup_additional_pages      syscall32_setup_pages
@@ -330,7 +349,7 @@ static inline int mmap_is_ia32(void)
         return 1;
 #endif
 #ifdef CONFIG_IA32_EMULATION
-        if (test_thread_flag(TIF_IA32))
+        if (test_thread_flag(TIF_ADDR32))
                 return 1;
 #endif
         return 0;
diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
index 1f7e62517284..7d0c18587709 100644
--- a/arch/x86/include/asm/ia32.h
+++ b/arch/x86/include/asm/ia32.h
@@ -43,6 +43,15 @@ struct ucontext_ia32 {
         compat_sigset_t   uc_sigmask;   /* mask last for extensibility */
 };
 
+struct ucontext_x32 {
+        unsigned int      uc_flags;
+        unsigned int      uc_link;
+        stack_ia32_t      uc_stack;
+        unsigned int      uc__pad0;     /* needed for alignment */
+        struct sigcontext uc_mcontext;  /* the 64-bit sigcontext type */
+        compat_sigset_t   uc_sigmask;   /* mask last for extensibility */
+};
+
 /* This matches struct stat64 in glibc2.2, hence the absolutely
  * insane amounts of padding around dev_t's.
  */
@@ -116,6 +125,15 @@ typedef struct compat_siginfo {
                         compat_clock_t _stime;
                 } _sigchld;
 
+                /* SIGCHLD (x32 version) */
+                struct {
+                        unsigned int _pid;      /* which child */
+                        unsigned int _uid;      /* sender's uid */
+                        int _status;            /* exit code */
+                        s64 _utime;
+                        s64 _stime;
+                } _sigchld_x32;
+
                 /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
                 struct {
                         unsigned int _addr;     /* faulting insn/memory ref. */
diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h
index 4365ffdb461f..7e3f17f92c66 100644
--- a/arch/x86/include/asm/mtrr.h
+++ b/arch/x86/include/asm/mtrr.h
@@ -29,18 +29,18 @@
 
 #define MTRR_IOCTL_BASE 'M'
 
-struct mtrr_sentry {
-    unsigned long base;    /*  Base address     */
-    unsigned int size;    /*  Size of region   */
-    unsigned int type;     /*  Type of region   */
-};
-
 /* Warning: this structure has a different order from i386
    on x86-64. The 32bit emulation code takes care of that.
    But you need to use this for 64bit, otherwise your X server
    will break. */
 
 #ifdef __i386__
+struct mtrr_sentry {
+    unsigned long base;    /*  Base address     */
+    unsigned int size;    /*  Size of region   */
+    unsigned int type;     /*  Type of region   */
+};
+
 struct mtrr_gentry {
     unsigned int regnum;   /*  Register number  */
     unsigned long base;    /*  Base address     */
@@ -50,12 +50,20 @@ struct mtrr_gentry {
 
 #else /* __i386__ */
 
+struct mtrr_sentry {
+        __u64 base;             /*  Base address     */
+        __u32 size;             /*  Size of region   */
+        __u32 type;             /*  Type of region   */
+};
+
 struct mtrr_gentry {
-    unsigned long base;    /*  Base address     */
-    unsigned int size;    /*  Size of region   */
-    unsigned int regnum;   /*  Register number  */
-    unsigned int type;     /*  Type of region   */
+        __u64 base;             /*  Base address     */
+        __u32 size;             /*  Size of region   */
+        __u32 regnum;           /*  Register number  */
+        __u32 type;             /*  Type of region   */
+        __u32 _pad;             /*  Unused           */
 };
+
 #endif /* !__i386__ */
 
 struct mtrr_var_range {
diff --git a/arch/x86/include/asm/posix_types.h b/arch/x86/include/asm/posix_types.h
index bb7133dc155d..3427b7798dbc 100644
--- a/arch/x86/include/asm/posix_types.h
+++ b/arch/x86/include/asm/posix_types.h
@@ -7,7 +7,9 @@
 #else
 # ifdef __i386__
 #  include "posix_types_32.h"
-# else
+# elif defined(__LP64__)
 #  include "posix_types_64.h"
+# else
+#  include "posix_types_x32.h"
 # endif
 #endif
diff --git a/arch/x86/include/asm/posix_types_32.h b/arch/x86/include/asm/posix_types_32.h
index f7d9adf82e53..99f262e04b91 100644
--- a/arch/x86/include/asm/posix_types_32.h
+++ b/arch/x86/include/asm/posix_types_32.h
@@ -7,79 +7,22 @@
  * assume GCC is being used.
  */
 
-typedef unsigned long   __kernel_ino_t;
 typedef unsigned short  __kernel_mode_t;
+#define __kernel_mode_t __kernel_mode_t
+
 typedef unsigned short  __kernel_nlink_t;
-typedef long            __kernel_off_t;
-typedef int             __kernel_pid_t;
+#define __kernel_nlink_t __kernel_nlink_t
+
 typedef unsigned short  __kernel_ipc_pid_t;
+#define __kernel_ipc_pid_t __kernel_ipc_pid_t
+
 typedef unsigned short  __kernel_uid_t;
 typedef unsigned short  __kernel_gid_t;
-typedef unsigned int    __kernel_size_t;
-typedef int             __kernel_ssize_t;
-typedef int             __kernel_ptrdiff_t;
-typedef long            __kernel_time_t;
-typedef long            __kernel_suseconds_t;
-typedef long            __kernel_clock_t;
-typedef int             __kernel_timer_t;
-typedef int             __kernel_clockid_t;
-typedef int             __kernel_daddr_t;
-typedef char *          __kernel_caddr_t;
-typedef unsigned short  __kernel_uid16_t;
-typedef unsigned short  __kernel_gid16_t;
-typedef unsigned int    __kernel_uid32_t;
-typedef unsigned int    __kernel_gid32_t;
+#define __kernel_uid_t __kernel_uid_t
 
-typedef unsigned short  __kernel_old_uid_t;
-typedef unsigned short  __kernel_old_gid_t;
 typedef unsigned short  __kernel_old_dev_t;
+#define __kernel_old_dev_t __kernel_old_dev_t
 
-#ifdef __GNUC__
-typedef long long       __kernel_loff_t;
-#endif
-
-typedef struct {
-        int     val[2];
-} __kernel_fsid_t;
-
-#if defined(__KERNEL__)
-
-#undef  __FD_SET
-#define __FD_SET(fd,fdsetp)                                     \
-        asm volatile("btsl %1,%0":                              \
-                     "+m" (*(__kernel_fd_set *)(fdsetp))        \
-                     : "r" ((int)(fd)))
-
-#undef  __FD_CLR
-#define __FD_CLR(fd,fdsetp)                                     \
-        asm volatile("btrl %1,%0":                              \
-                     "+m" (*(__kernel_fd_set *)(fdsetp))        \
-                     : "r" ((int) (fd)))
-
-#undef  __FD_ISSET
-#define __FD_ISSET(fd,fdsetp)                                   \
-        (__extension__                                          \
-         ({                                                     \
-         unsigned char __result;                                \
-         asm volatile("btl %1,%2 ; setb %0"                     \
-                      : "=q" (__result)                         \
-                      : "r" ((int)(fd)),                        \
-                        "m" (*(__kernel_fd_set *)(fdsetp)));    \
-         __result;                                              \
-}))
-
-#undef  __FD_ZERO
-#define __FD_ZERO(fdsetp)                                       \
-do {                                                            \
-        int __d0, __d1;                                         \
-        asm volatile("cld ; rep ; stosl"                        \
-                     : "=m" (*(__kernel_fd_set *)(fdsetp)),     \
-                       "=&c" (__d0), "=&D" (__d1)               \
-                     : "a" (0), "1" (__FDSET_LONGS),            \
-                       "2" ((__kernel_fd_set *)(fdsetp))        \
-                     : "memory");                               \
-} while (0)
-
-#endif /* defined(__KERNEL__) */
+#include <asm-generic/posix_types.h>
 
 #endif /* _ASM_X86_POSIX_TYPES_32_H */
diff --git a/arch/x86/include/asm/posix_types_64.h b/arch/x86/include/asm/posix_types_64.h
index eb8d2d92b63e..cba0c1ead162 100644
--- a/arch/x86/include/asm/posix_types_64.h
+++ b/arch/x86/include/asm/posix_types_64.h
@@ -7,113 +7,13 @@
  * assume GCC is being used.
  */
 
-typedef unsigned long   __kernel_ino_t;
-typedef unsigned int    __kernel_mode_t;
-typedef unsigned long   __kernel_nlink_t;
-typedef long            __kernel_off_t;
-typedef int             __kernel_pid_t;
-typedef int             __kernel_ipc_pid_t;
-typedef unsigned int    __kernel_uid_t;
-typedef unsigned int    __kernel_gid_t;
-typedef unsigned long   __kernel_size_t;
-typedef long            __kernel_ssize_t;
-typedef long            __kernel_ptrdiff_t;
-typedef long            __kernel_time_t;
-typedef long            __kernel_suseconds_t;
-typedef long            __kernel_clock_t;
-typedef int             __kernel_timer_t;
-typedef int             __kernel_clockid_t;
-typedef int             __kernel_daddr_t;
-typedef char *          __kernel_caddr_t;
-typedef unsigned short  __kernel_uid16_t;
-typedef unsigned short  __kernel_gid16_t;
-
-#ifdef __GNUC__
-typedef long long       __kernel_loff_t;
-#endif
-
-typedef struct {
-        int     val[2];
-} __kernel_fsid_t;
-
 typedef unsigned short __kernel_old_uid_t;
 typedef unsigned short __kernel_old_gid_t;
-typedef __kernel_uid_t __kernel_uid32_t;
-typedef __kernel_gid_t __kernel_gid32_t;
+#define __kernel_old_uid_t __kernel_old_uid_t
 
 typedef unsigned long   __kernel_old_dev_t;
+#define __kernel_old_dev_t __kernel_old_dev_t
 
-#ifdef __KERNEL__
-
-#undef __FD_SET
-static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
-{
-        unsigned long _tmp = fd / __NFDBITS;
-        unsigned long _rem = fd % __NFDBITS;
-        fdsetp->fds_bits[_tmp] |= (1UL<<_rem);
-}
-
-#undef __FD_CLR
-static inline void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
-{
-        unsigned long _tmp = fd / __NFDBITS;
-        unsigned long _rem = fd % __NFDBITS;
-        fdsetp->fds_bits[_tmp] &= ~(1UL<<_rem);
-}
-
-#undef __FD_ISSET
-static inline int __FD_ISSET(unsigned long fd, __const__ __kernel_fd_set *p)
-{
-        unsigned long _tmp = fd / __NFDBITS;
-        unsigned long _rem = fd % __NFDBITS;
-        return (p->fds_bits[_tmp] & (1UL<<_rem)) != 0;
-}
-
-/*
- * This will unroll the loop for the normal constant cases (8 or 32 longs,
- * for 256 and 1024-bit fd_sets respectively)
- */
-#undef __FD_ZERO
-static inline void __FD_ZERO(__kernel_fd_set *p)
-{
-        unsigned long *tmp = p->fds_bits;
-        int i;
-
-        if (__builtin_constant_p(__FDSET_LONGS)) {
-                switch (__FDSET_LONGS) {
-                case 32:
-                        tmp[ 0] = 0; tmp[ 1] = 0; tmp[ 2] = 0; tmp[ 3] = 0;
-                        tmp[ 4] = 0; tmp[ 5] = 0; tmp[ 6] = 0; tmp[ 7] = 0;
-                        tmp[ 8] = 0; tmp[ 9] = 0; tmp[10] = 0; tmp[11] = 0;
-                        tmp[12] = 0; tmp[13] = 0; tmp[14] = 0; tmp[15] = 0;
-                        tmp[16] = 0; tmp[17] = 0; tmp[18] = 0; tmp[19] = 0;
-                        tmp[20] = 0; tmp[21] = 0; tmp[22] = 0; tmp[23] = 0;
-                        tmp[24] = 0; tmp[25] = 0; tmp[26] = 0; tmp[27] = 0;
-                        tmp[28] = 0; tmp[29] = 0; tmp[30] = 0; tmp[31] = 0;
-                        return;
-                case 16:
-                        tmp[ 0] = 0; tmp[ 1] = 0; tmp[ 2] = 0; tmp[ 3] = 0;
-                        tmp[ 4] = 0; tmp[ 5] = 0; tmp[ 6] = 0; tmp[ 7] = 0;
-                        tmp[ 8] = 0; tmp[ 9] = 0; tmp[10] = 0; tmp[11] = 0;
-                        tmp[12] = 0; tmp[13] = 0; tmp[14] = 0; tmp[15] = 0;
-                        return;
-                case 8:
-                        tmp[ 0] = 0; tmp[ 1] = 0; tmp[ 2] = 0; tmp[ 3] = 0;
-                        tmp[ 4] = 0; tmp[ 5] = 0; tmp[ 6] = 0; tmp[ 7] = 0;
-                        return;
-                case 4:
-                        tmp[ 0] = 0; tmp[ 1] = 0; tmp[ 2] = 0; tmp[ 3] = 0;
-                        return;
-                }
-        }
-        i = __FDSET_LONGS;
-        while (i) {
-                i--;
-                *tmp = 0;
-                tmp++;
-        }
-}
-
-#endif /* defined(__KERNEL__) */
+#include <asm-generic/posix_types.h>
 
 #endif /* _ASM_X86_POSIX_TYPES_64_H */
diff --git a/arch/x86/include/asm/posix_types_x32.h b/arch/x86/include/asm/posix_types_x32.h
new file mode 100644
index 000000000000..85f9bdafa93c
--- /dev/null
+++ b/arch/x86/include/asm/posix_types_x32.h
@@ -0,0 +1,19 @@
+#ifndef _ASM_X86_POSIX_TYPES_X32_H
+#define _ASM_X86_POSIX_TYPES_X32_H
+
+/*
+ * This file is only used by user-level software, so you need to
+ * be a little careful about namespace pollution etc.  Also, we cannot
+ * assume GCC is being used.
+ *
+ * These types should generally match the ones used by the 64-bit kernel,
+ *
+ */
+
+typedef long long __kernel_long_t;
+typedef unsigned long long __kernel_ulong_t;
+#define __kernel_long_t __kernel_long_t
+
+#include <asm/posix_types_64.h>
+
+#endif /* _ASM_X86_POSIX_TYPES_X32_H */
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 58545c97d071..02ce0b379647 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -926,9 +926,9 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
 #define IA32_PAGE_OFFSET        ((current->personality & ADDR_LIMIT_3GB) ? \
                                         0xc0000000 : 0xFFFFe000)
 
-#define TASK_SIZE               (test_thread_flag(TIF_IA32) ? \
+#define TASK_SIZE               (test_thread_flag(TIF_ADDR32) ? \
                                         IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-#define TASK_SIZE_OF(child)     ((test_tsk_thread_flag(child, TIF_IA32)) ? \
+#define TASK_SIZE_OF(child)     ((test_tsk_thread_flag(child, TIF_ADDR32)) ? \
                                         IA32_PAGE_OFFSET : TASK_SIZE_MAX)
 
 #define STACK_TOP               TASK_SIZE
@@ -950,6 +950,12 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
 
 #define task_pt_regs(tsk)       ((struct pt_regs *)(tsk)->thread.sp0 - 1)
 extern unsigned long KSTK_ESP(struct task_struct *task);
+
+/*
+ * User space RSP while inside the SYSCALL fast path
+ */
+DECLARE_PER_CPU(unsigned long, old_rsp);
+
 #endif /* CONFIG_X86_64 */
 
 extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 35664547125b..dcfde52979c3 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -145,7 +145,6 @@ extern unsigned long
 convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs);
 extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
                          int error_code, int si_code);
-void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
 
 extern long syscall_trace_enter(struct pt_regs *);
 extern void syscall_trace_leave(struct pt_regs *);
diff --git a/arch/x86/include/asm/sigcontext.h b/arch/x86/include/asm/sigcontext.h
index 04459d25e66e..4a085383af27 100644
--- a/arch/x86/include/asm/sigcontext.h
+++ b/arch/x86/include/asm/sigcontext.h
@@ -230,34 +230,37 @@ struct sigcontext {
  * User-space might still rely on the old definition:
  */
 struct sigcontext {
-        unsigned long r8;
-        unsigned long r9;
-        unsigned long r10;
-        unsigned long r11;
-        unsigned long r12;
-        unsigned long r13;
-        unsigned long r14;
-        unsigned long r15;
-        unsigned long rdi;
-        unsigned long rsi;
-        unsigned long rbp;
-        unsigned long rbx;
-        unsigned long rdx;
-        unsigned long rax;
-        unsigned long rcx;
-        unsigned long rsp;
-        unsigned long rip;
-        unsigned long eflags;           /* RFLAGS */
-        unsigned short cs;
-        unsigned short gs;
-        unsigned short fs;
-        unsigned short __pad0;
-        unsigned long err;
-        unsigned long trapno;
-        unsigned long oldmask;
-        unsigned long cr2;
+        __u64 r8;
+        __u64 r9;
+        __u64 r10;
+        __u64 r11;
+        __u64 r12;
+        __u64 r13;
+        __u64 r14;
+        __u64 r15;
+        __u64 rdi;
+        __u64 rsi;
+        __u64 rbp;
+        __u64 rbx;
+        __u64 rdx;
+        __u64 rax;
+        __u64 rcx;
+        __u64 rsp;
+        __u64 rip;
+        __u64 eflags;           /* RFLAGS */
+        __u16 cs;
+        __u16 gs;
+        __u16 fs;
+        __u16 __pad0;
+        __u64 err;
+        __u64 trapno;
+        __u64 oldmask;
+        __u64 cr2;
         struct _fpstate __user *fpstate;        /* zero when no FPU context */
-        unsigned long reserved1[8];
+#ifndef __LP64__
+        __u32 __fpstate_pad;
+#endif
+        __u64 reserved1[8];
 };
 #endif /* !__KERNEL__ */
 
diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h
index 4e0fe26d27d3..7c7c27c97daa 100644
--- a/arch/x86/include/asm/sigframe.h
+++ b/arch/x86/include/asm/sigframe.h
@@ -59,12 +59,25 @@ struct rt_sigframe_ia32 {
 #endif /* defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) */
 
 #ifdef CONFIG_X86_64
+
 struct rt_sigframe {
         char __user *pretcode;
         struct ucontext uc;
         struct siginfo info;
         /* fp state follows here */
 };
+
+#ifdef CONFIG_X86_X32_ABI
+
+struct rt_sigframe_x32 {
+        u64 pretcode;
+        struct ucontext_x32 uc;
+        compat_siginfo_t info;
+        /* fp state follows here */
+};
+
+#endif /* CONFIG_X86_X32_ABI */
+
 #endif /* CONFIG_X86_64 */
 
 #endif /* _ASM_X86_SIGFRAME_H */
diff --git a/arch/x86/include/asm/sighandling.h b/arch/x86/include/asm/sighandling.h
new file mode 100644
index 000000000000..ada93b3b8c66
--- /dev/null
+++ b/arch/x86/include/asm/sighandling.h
@@ -0,0 +1,24 @@
+#ifndef _ASM_X86_SIGHANDLING_H
+#define _ASM_X86_SIGHANDLING_H
+
+#include <linux/compiler.h>
+#include <linux/ptrace.h>
+#include <linux/signal.h>
+
+#include <asm/processor-flags.h>
+
+#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
+
+#define __FIX_EFLAGS    (X86_EFLAGS_AC | X86_EFLAGS_OF | \
+                         X86_EFLAGS_DF | X86_EFLAGS_TF | X86_EFLAGS_SF | \
+                         X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \
+                         X86_EFLAGS_CF)
+
+void signal_fault(struct pt_regs *regs, void __user *frame, char *where);
+
+int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
+                       unsigned long *pax);
+int setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,
+                     struct pt_regs *regs, unsigned long mask);
+
+#endif /* _ASM_X86_SIGHANDLING_H */
diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
index cb238526a9f1..3fda9db48819 100644
--- a/arch/x86/include/asm/sys_ia32.h
+++ b/arch/x86/include/asm/sys_ia32.h
@@ -10,6 +10,8 @@
 #ifndef _ASM_X86_SYS_IA32_H
 #define _ASM_X86_SYS_IA32_H
 
+#ifdef CONFIG_COMPAT
+
 #include <linux/compiler.h>
 #include <linux/linkage.h>
 #include <linux/types.h>
@@ -36,8 +38,6 @@ asmlinkage long sys32_rt_sigaction(int, struct sigaction32 __user *,
                                    struct sigaction32 __user *, unsigned int);
 asmlinkage long sys32_sigaction(int, struct old_sigaction32 __user *,
                                 struct old_sigaction32 __user *);
-asmlinkage long sys32_rt_sigprocmask(int, compat_sigset_t __user *,
-                                     compat_sigset_t __user *, unsigned int);
 asmlinkage long sys32_alarm(unsigned int);
 
 asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);
@@ -83,4 +83,7 @@ asmlinkage long sys32_ipc(u32, int, int, int, compat_uptr_t, u32);
 
 asmlinkage long sys32_fanotify_mark(int, unsigned int, u32, u32, int,
                                     const char __user *);
+
+#endif /* CONFIG_COMPAT */
+
 #endif /* _ASM_X86_SYS_IA32_H */
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
index d962e5652a73..386b78686c4d 100644
--- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h
@@ -16,6 +16,7 @@
 #include <linux/sched.h>
 #include <linux/err.h>
 #include <asm/asm-offsets.h>    /* For NR_syscalls */
+#include <asm/unistd.h>
 
 extern const unsigned long sys_call_table[];
 
@@ -26,13 +27,13 @@ extern const unsigned long sys_call_table[];
  */
 static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs)
 {
-        return regs->orig_ax;
+        return regs->orig_ax & __SYSCALL_MASK;
 }
 
 static inline void syscall_rollback(struct task_struct *task,
                                     struct pt_regs *regs)
 {
-        regs->ax = regs->orig_ax;
+        regs->ax = regs->orig_ax & __SYSCALL_MASK;
 }
 
 static inline long syscall_get_error(struct task_struct *task,
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index cfd8144d5527..af1db7e722f4 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -86,7 +86,7 @@ struct thread_info {
 #define TIF_MCE_NOTIFY          10      /* notify userspace of an MCE */
 #define TIF_USER_RETURN_NOTIFY  11      /* notify kernel of userspace return */
 #define TIF_NOTSC               16      /* TSC is not accessible in userland */
-#define TIF_IA32                17      /* 32bit process */
+#define TIF_IA32                17      /* IA32 compatibility process */
 #define TIF_FORK                18      /* ret_from_fork */
 #define TIF_MEMDIE              20      /* is terminating due to OOM killer */
 #define TIF_DEBUG               21      /* uses debug registers */
@@ -95,6 +95,8 @@ struct thread_info {
 #define TIF_BLOCKSTEP           25      /* set when we want DEBUGCTLMSR_BTF */
 #define TIF_LAZY_MMU_UPDATES    27      /* task is updating the mmu lazily */
 #define TIF_SYSCALL_TRACEPOINT  28      /* syscall tracepoint instrumentation */
+#define TIF_ADDR32              29      /* 32-bit address space on 64 bits */
+#define TIF_X32                 30      /* 32-bit native x86-64 binary */
 
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
 #define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
@@ -116,6 +118,8 @@ struct thread_info {
 #define _TIF_BLOCKSTEP          (1 << TIF_BLOCKSTEP)
 #define _TIF_LAZY_MMU_UPDATES   (1 << TIF_LAZY_MMU_UPDATES)
 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
+#define _TIF_ADDR32             (1 << TIF_ADDR32)
+#define _TIF_X32                (1 << TIF_X32)
 
 /* work to do in syscall_trace_enter() */
 #define _TIF_WORK_SYSCALL_ENTRY \
diff --git a/arch/x86/include/asm/unistd.h b/arch/x86/include/asm/unistd.h
index 21f77b89e47a..37cdc9d99bb1 100644
--- a/arch/x86/include/asm/unistd.h
+++ b/arch/x86/include/asm/unistd.h
@@ -1,7 +1,17 @@
 #ifndef _ASM_X86_UNISTD_H
 #define _ASM_X86_UNISTD_H 1
 
+/* x32 syscall flag bit */
+#define __X32_SYSCALL_BIT       0x40000000
+
 #ifdef __KERNEL__
+
+# ifdef CONFIG_X86_X32_ABI
+#  define __SYSCALL_MASK (~(__X32_SYSCALL_BIT))
+# else
+#  define __SYSCALL_MASK (~0)
+# endif
+
 # ifdef CONFIG_X86_32
 
 #  include <asm/unistd_32.h>
@@ -14,6 +24,7 @@
 # else
 
 #  include <asm/unistd_64.h>
+#  include <asm/unistd_64_x32.h>
 #  define __ARCH_WANT_COMPAT_SYS_TIME
 
 # endif
@@ -52,8 +63,10 @@
 #else
 # ifdef __i386__
 #  include <asm/unistd_32.h>
-# else
+# elif defined(__LP64__)
 #  include <asm/unistd_64.h>
+# else
+#  include <asm/unistd_x32.h>
 # endif
 #endif
 
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
index 834e897b1e25..1b4754f82ba7 100644
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
@@ -1,6 +1,12 @@
 #include <asm/ia32.h>
 
 #define __SYSCALL_64(nr, sym, compat) [nr] = 1,
+#define __SYSCALL_COMMON(nr, sym, compat) [nr] = 1,
+#ifdef CONFIG_X86_X32_ABI
+# define __SYSCALL_X32(nr, sym, compat) [nr] = 1,
+#else
+# define __SYSCALL_X32(nr, sym, compat) /* nothing */
+#endif
 static char syscalls_64[] = {
 #include <asm/syscalls_64.h>
 };
diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
index 79289632cb27..a041e094b8b9 100644
--- a/arch/x86/kernel/cpu/mtrr/if.c
+++ b/arch/x86/kernel/cpu/mtrr/if.c
@@ -167,6 +167,7 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg)
 {
         int err = 0;
         mtrr_type type;
+        unsigned long base;
         unsigned long size;
         struct mtrr_sentry sentry;
         struct mtrr_gentry gentry;
@@ -267,14 +268,14 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg)
 #endif
                 if (gentry.regnum >= num_var_ranges)
                         return -EINVAL;
-                mtrr_if->get(gentry.regnum, &gentry.base, &size, &type);
+                mtrr_if->get(gentry.regnum, &base, &size, &type);
 
                 /* Hide entries that go above 4GB */
-                if (gentry.base + size - 1 >= (1UL << (8 * sizeof(gentry.size) - PAGE_SHIFT))
+                if (base + size - 1 >= (1UL << (8 * sizeof(gentry.size) - PAGE_SHIFT))
                     || size >= (1UL << (8 * sizeof(gentry.size) - PAGE_SHIFT)))
                         gentry.base = gentry.size = gentry.type = 0;
                 else {
-                        gentry.base <<= PAGE_SHIFT;
+                        gentry.base = base << PAGE_SHIFT;
                         gentry.size = size << PAGE_SHIFT;
                         gentry.type = type;
                 }
@@ -321,11 +322,12 @@ mtrr_ioctl(struct file *file, unsigned int cmd, unsigned long __arg)
 #endif
                 if (gentry.regnum >= num_var_ranges)
                         return -EINVAL;
-                mtrr_if->get(gentry.regnum, &gentry.base, &size, &type);
+                mtrr_if->get(gentry.regnum, &base, &size, &type);
                 /* Hide entries that would overflow */
                 if (size != (__typeof__(gentry.size))size)
                         gentry.base = gentry.size = gentry.type = 0;
                 else {
+                        gentry.base = base;
                         gentry.size = size;
                         gentry.type = type;
                 }
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 5adce1040b11..63c0e058a405 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -28,7 +28,6 @@
 #include <asm/apic.h>
 #include <asm/stacktrace.h>
 #include <asm/nmi.h>
-#include <asm/compat.h>
 #include <asm/smp.h>
 #include <asm/alternative.h>
 
@@ -1595,6 +1594,9 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)
 }
 
 #ifdef CONFIG_COMPAT
+
+#include <asm/compat.h>
+
 static inline int
 perf_callchain_user32(struct pt_regs *regs, struct perf_callchain_entry *entry)
 {
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 1333d9851778..2925e14fb1d9 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -482,7 +482,12 @@ GLOBAL(system_call_after_swapgs)
         testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
         jnz tracesys
 system_call_fastpath:
+#if __SYSCALL_MASK == ~0
         cmpq $__NR_syscall_max,%rax
+#else
+        andl $__SYSCALL_MASK,%eax
+        cmpl $__NR_syscall_max,%eax
+#endif
         ja badsys
         movq %r10,%rcx
         call *sys_call_table(,%rax,8)  # XXX:    rip relative
@@ -596,7 +601,12 @@ tracesys:
          */
         LOAD_ARGS ARGOFFSET, 1
         RESTORE_REST
+#if __SYSCALL_MASK == ~0
         cmpq $__NR_syscall_max,%rax
+#else
+        andl $__SYSCALL_MASK,%eax
+        cmpl $__NR_syscall_max,%eax
+#endif
         ja   int_ret_from_sys_call      /* RAX(%rsp) set to -ENOSYS above */
         movq %r10,%rcx  /* fixup for C */
         call *sys_call_table(,%rax,8)
@@ -736,6 +746,40 @@ ENTRY(stub_rt_sigreturn)
         CFI_ENDPROC
 END(stub_rt_sigreturn)
 
+#ifdef CONFIG_X86_X32_ABI
+        PTREGSCALL stub_x32_sigaltstack, sys32_sigaltstack, %rdx
+
+ENTRY(stub_x32_rt_sigreturn)
+        CFI_STARTPROC
+        addq $8, %rsp
+        PARTIAL_FRAME 0
+        SAVE_REST
+        movq %rsp,%rdi
+        FIXUP_TOP_OF_STACK %r11
+        call sys32_x32_rt_sigreturn
+        movq %rax,RAX(%rsp) # fixme, this could be done at the higher layer
+        RESTORE_REST
+        jmp int_ret_from_sys_call
+        CFI_ENDPROC
+END(stub_x32_rt_sigreturn)
+
+ENTRY(stub_x32_execve)
+        CFI_STARTPROC
+        addq $8, %rsp
+        PARTIAL_FRAME 0
+        SAVE_REST
+        FIXUP_TOP_OF_STACK %r11
+        movq %rsp, %rcx
+        call sys32_execve
+        RESTORE_TOP_OF_STACK %r11
+        movq %rax,RAX(%rsp)
+        RESTORE_REST
+        jmp int_ret_from_sys_call
+        CFI_ENDPROC
+END(stub_x32_execve)
+
+#endif
+
 /*
  * Build the entry stubs and pointer table with some assembler magic.
  * We pack 7 stubs into a single 32-byte chunk, which will fit in a
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index cfa5c90c01db..550e77b1b948 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -365,7 +365,9 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
 void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp)
 {
         start_thread_common(regs, new_ip, new_sp,
-                            __USER32_CS, __USER32_DS, __USER32_DS);
+                            test_thread_flag(TIF_X32)
+                            ? __USER_CS : __USER32_CS,
+                            __USER_DS, __USER_DS);
 }
 #endif
 
@@ -488,6 +490,8 @@ void set_personality_64bit(void)
 
         /* Make sure to be in 64bit mode */
         clear_thread_flag(TIF_IA32);
+        clear_thread_flag(TIF_ADDR32);
+        clear_thread_flag(TIF_X32);
 
         /* Ensure the corresponding mm is not marked. */
         if (current->mm)
@@ -500,20 +504,31 @@ void set_personality_64bit(void)
         current->personality &= ~READ_IMPLIES_EXEC;
 }
 
-void set_personality_ia32(void)
+void set_personality_ia32(bool x32)
 {
         /* inherit personality from parent */
 
         /* Make sure to be in 32bit mode */
-        set_thread_flag(TIF_IA32);
-        current->personality |= force_personality32;
+        set_thread_flag(TIF_ADDR32);
 
         /* Mark the associated mm as containing 32-bit tasks. */
         if (current->mm)
                 current->mm->context.ia32_compat = 1;
 
-        /* Prepare the first "return" to user space */
-        current_thread_info()->status |= TS_COMPAT;
+        if (x32) {
+                clear_thread_flag(TIF_IA32);
+                set_thread_flag(TIF_X32);
+                current->personality &= ~READ_IMPLIES_EXEC;
+                /* is_compat_task() uses the presence of the x32
+                   syscall bit flag to determine compat status */
+                current_thread_info()->status &= ~TS_COMPAT;
+        } else {
+                set_thread_flag(TIF_IA32);
+                clear_thread_flag(TIF_X32);
+                current->personality |= force_personality32;
+                /* Prepare the first "return" to user space */
+                current_thread_info()->status |= TS_COMPAT;
+        }
 }
 
 unsigned long get_wchan(struct task_struct *p)
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index 50267386b766..93e7877a19c4 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -1130,6 +1130,100 @@ static int genregs32_set(struct task_struct *target,
         return ret;
 }
 
+#ifdef CONFIG_X86_X32_ABI
+static long x32_arch_ptrace(struct task_struct *child,
+                            compat_long_t request, compat_ulong_t caddr,
+                            compat_ulong_t cdata)
+{
+        unsigned long addr = caddr;
+        unsigned long data = cdata;
+        void __user *datap = compat_ptr(data);
+        int ret;
+
+        switch (request) {
+        /* Read 32bits at location addr in the USER area.  Only allow
+           to return the lower 32bits of segment and debug registers.  */
+        case PTRACE_PEEKUSR: {
+                u32 tmp;
+
+                ret = -EIO;
+                if ((addr & (sizeof(data) - 1)) || addr >= sizeof(struct user) ||
+                    addr < offsetof(struct user_regs_struct, cs))
+                        break;
+
+                tmp = 0;  /* Default return condition */
+                if (addr < sizeof(struct user_regs_struct))
+                        tmp = getreg(child, addr);
+                else if (addr >= offsetof(struct user, u_debugreg[0]) &&
+                         addr <= offsetof(struct user, u_debugreg[7])) {
+                        addr -= offsetof(struct user, u_debugreg[0]);
+                        tmp = ptrace_get_debugreg(child, addr / sizeof(data));
+                }
+                ret = put_user(tmp, (__u32 __user *)datap);
+                break;
+        }
+
+        /* Write the word at location addr in the USER area.  Only allow
+           to update segment and debug registers with the upper 32bits
+           zero-extended. */
+        case PTRACE_POKEUSR:
+                ret = -EIO;
+                if ((addr & (sizeof(data) - 1)) || addr >= sizeof(struct user) ||
+                    addr < offsetof(struct user_regs_struct, cs))
+                        break;
+
+                if (addr < sizeof(struct user_regs_struct))
+                        ret = putreg(child, addr, data);
+                else if (addr >= offsetof(struct user, u_debugreg[0]) &&
+                         addr <= offsetof(struct user, u_debugreg[7])) {
+                        addr -= offsetof(struct user, u_debugreg[0]);
+                        ret = ptrace_set_debugreg(child,
+                                                  addr / sizeof(data), data);
+                }
+                break;
+
+        case PTRACE_GETREGS:    /* Get all gp regs from the child. */
+                return copy_regset_to_user(child,
+                                           task_user_regset_view(current),
+                                           REGSET_GENERAL,
+                                           0, sizeof(struct user_regs_struct),
+                                           datap);
+
+        case PTRACE_SETREGS:    /* Set all gp regs in the child. */
+                return copy_regset_from_user(child,
+                                             task_user_regset_view(current),
+                                             REGSET_GENERAL,
+                                             0, sizeof(struct user_regs_struct),
+                                             datap);
+
+        case PTRACE_GETFPREGS:  /* Get the child FPU state. */
+                return copy_regset_to_user(child,
+                                           task_user_regset_view(current),
+                                           REGSET_FP,
+                                           0, sizeof(struct user_i387_struct),
+                                           datap);
+
+        case PTRACE_SETFPREGS:  /* Set the child FPU state. */
+                return copy_regset_from_user(child,
+                                             task_user_regset_view(current),
+                                             REGSET_FP,
+                                             0, sizeof(struct user_i387_struct),
+                                             datap);
+
+                /* normal 64bit interface to access TLS data.
+                   Works just like arch_prctl, except that the arguments
+                   are reversed. */
+        case PTRACE_ARCH_PRCTL:
+                return do_arch_prctl(child, data, addr);
+
+        default:
+                return compat_ptrace_request(child, request, addr, data);
+        }
+
+        return ret;
+}
+#endif
+
 long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                         compat_ulong_t caddr, compat_ulong_t cdata)
 {
@@ -1139,6 +1233,11 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
         int ret;
         __u32 val;
 
+#ifdef CONFIG_X86_X32_ABI
+        if (!is_ia32_task())
+                return x32_arch_ptrace(child, request, caddr, cdata);
+#endif
+
         switch (request) {
         case PTRACE_PEEKUSR:
                 ret = getreg32(child, addr, &val);
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 46a01bdc27e2..c3846b6fb726 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -10,10 +10,8 @@
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/kernel.h>
-#include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/wait.h>
-#include <linux/ptrace.h>
 #include <linux/tracehook.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
@@ -26,10 +24,12 @@
 #include <asm/i387.h>
 #include <asm/vdso.h>
 #include <asm/mce.h>
+#include <asm/sighandling.h>
 
 #ifdef CONFIG_X86_64
 #include <asm/proto.h>
 #include <asm/ia32_unistd.h>
+#include <asm/sys_ia32.h>
 #endif /* CONFIG_X86_64 */
 
 #include <asm/syscall.h>
@@ -37,13 +37,6 @@
 
 #include <asm/sigframe.h>
 
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-
-#define __FIX_EFLAGS    (X86_EFLAGS_AC | X86_EFLAGS_OF | \
-                         X86_EFLAGS_DF | X86_EFLAGS_TF | X86_EFLAGS_SF | \
-                         X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \
-                         X86_EFLAGS_CF)
-
 #ifdef CONFIG_X86_32
 # define FIX_EFLAGS     (__FIX_EFLAGS | X86_EFLAGS_RF)
 #else
@@ -68,9 +61,8 @@
         regs->seg = GET_SEG(seg) | 3;                   \
 } while (0)
 
-static int
-restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
-                   unsigned long *pax)
+int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
+                       unsigned long *pax)
 {
         void __user *buf;
         unsigned int tmpflags;
@@ -125,9 +117,8 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
         return err;
 }
 
-static int
-setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,
-                 struct pt_regs *regs, unsigned long mask)
+int setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,
+                     struct pt_regs *regs, unsigned long mask)
 {
         int err = 0;
 
@@ -642,6 +633,16 @@ static int signr_convert(int sig)
 #define is_ia32 0
 #endif /* CONFIG_IA32_EMULATION */
 
+#ifdef CONFIG_X86_X32_ABI
+#define is_x32  test_thread_flag(TIF_X32)
+
+static int x32_setup_rt_frame(int sig, struct k_sigaction *ka,
+                              siginfo_t *info, compat_sigset_t *set,
+                              struct pt_regs *regs);
+#else /* !CONFIG_X86_X32_ABI */
+#define is_x32  0
+#endif /* CONFIG_X86_X32_ABI */
+
 int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 sigset_t *set, struct pt_regs *regs);
 int ia32_setup_frame(int sig, struct k_sigaction *ka,
@@ -666,8 +667,14 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                         ret = ia32_setup_rt_frame(usig, ka, info, set, regs);
                 else
                         ret = ia32_setup_frame(usig, ka, set, regs);
-        } else
+#ifdef CONFIG_X86_X32_ABI
+        } else if (is_x32) {
+                ret = x32_setup_rt_frame(usig, ka, info,
+                                         (compat_sigset_t *)set, regs);
+#endif
+        } else {
                 ret = __setup_rt_frame(sig, ka, info, set, regs);
+        }
 
         if (ret) {
                 force_sigsegv(sig, current);
@@ -850,3 +857,102 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
 
         force_sig(SIGSEGV, me);
 }
+
+#ifdef CONFIG_X86_X32_ABI
+static int x32_setup_rt_frame(int sig, struct k_sigaction *ka,
+                              siginfo_t *info, compat_sigset_t *set,
+                              struct pt_regs *regs)
+{
+        struct rt_sigframe_x32 __user *frame;
+        void __user *restorer;
+        int err = 0;
+        void __user *fpstate = NULL;
+
+        frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
+
+        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
+                return -EFAULT;
+
+        if (ka->sa.sa_flags & SA_SIGINFO) {
+                if (copy_siginfo_to_user32(&frame->info, info))
+                        return -EFAULT;
+        }
+
+        put_user_try {
+                /* Create the ucontext.  */
+                if (cpu_has_xsave)
+                        put_user_ex(UC_FP_XSTATE, &frame->uc.uc_flags);
+                else
+                        put_user_ex(0, &frame->uc.uc_flags);
+                put_user_ex(0, &frame->uc.uc_link);
+                put_user_ex(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
+                put_user_ex(sas_ss_flags(regs->sp),
+                            &frame->uc.uc_stack.ss_flags);
+                put_user_ex(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
+                put_user_ex(0, &frame->uc.uc__pad0);
+                err |= setup_sigcontext(&frame->uc.uc_mcontext, fpstate,
+                                        regs, set->sig[0]);
+                err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
+
+                if (ka->sa.sa_flags & SA_RESTORER) {
+                        restorer = ka->sa.sa_restorer;
+                } else {
+                        /* could use a vstub here */
+                        restorer = NULL;
+                        err |= -EFAULT;
+                }
+                put_user_ex(restorer, &frame->pretcode);
+        } put_user_catch(err);
+
+        if (err)
+                return -EFAULT;
+
+        /* Set up registers for signal handler */
+        regs->sp = (unsigned long) frame;
+        regs->ip = (unsigned long) ka->sa.sa_handler;
+
+        /* We use the x32 calling convention here... */
+        regs->di = sig;
+        regs->si = (unsigned long) &frame->info;
+        regs->dx = (unsigned long) &frame->uc;
+
+        loadsegment(ds, __USER_DS);
+        loadsegment(es, __USER_DS);
+
+        regs->cs = __USER_CS;
+        regs->ss = __USER_DS;
+
+        return 0;
+}
+
+asmlinkage long sys32_x32_rt_sigreturn(struct pt_regs *regs)
+{
+        struct rt_sigframe_x32 __user *frame;
+        sigset_t set;
+        unsigned long ax;
+        struct pt_regs tregs;
+
+        frame = (struct rt_sigframe_x32 __user *)(regs->sp - 8);
+
+        if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
+                goto badframe;
+        if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
+                goto badframe;
+
+        sigdelsetmask(&set, ~_BLOCKABLE);
+        set_current_blocked(&set);
+
+        if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax))
+                goto badframe;
+
+        tregs = *regs;
+        if (sys32_sigaltstack(&frame->uc.uc_stack, NULL, &tregs) == -EFAULT)
+                goto badframe;
+
+        return ax;
+
+badframe:
+        signal_fault(regs, frame, "x32 rt_sigreturn");
+        return 0;
+}
+#endif
diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index 051489082d59..f921df8c2099 100644
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -98,7 +98,7 @@ out:
 static void find_start_end(unsigned long flags, unsigned long *begin,
                            unsigned long *end)
 {
-        if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
+        if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
                 unsigned long new_begin;
                 /* This is usually used needed to map code in small
                    model, so it needs to be in the first 31bit. Limit
@@ -144,7 +144,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
                     (!vma || addr + len <= vma->vm_start))
                         return addr;
         }
-        if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
+        if (((flags & MAP_32BIT) || test_thread_flag(TIF_ADDR32))
             && len <= mm->cached_hole_size) {
                 mm->cached_hole_size = 0;
                 mm->free_area_cache = begin;
@@ -205,7 +205,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
                 return addr;
 
         /* for MAP_32BIT mappings we force the legact mmap base */
-        if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
+        if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
                 goto bottomup;
 
         /* requesting a specific address */
diff --git a/arch/x86/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c
index 7ac7943be02c..5c7f8c20da74 100644
--- a/arch/x86/kernel/syscall_64.c
+++ b/arch/x86/kernel/syscall_64.c
@@ -5,6 +5,14 @@
 #include <linux/cache.h>
 #include <asm/asm-offsets.h>
 
+#define __SYSCALL_COMMON(nr, sym, compat) __SYSCALL_64(nr, sym, compat)
+
+#ifdef CONFIG_X86_X32_ABI
+# define __SYSCALL_X32(nr, sym, compat) __SYSCALL_64(nr, sym, compat)
+#else
+# define __SYSCALL_X32(nr, sym, compat) /* nothing */
+#endif
+
 #define __SYSCALL_64(nr, sym, compat) extern asmlinkage void sym(void) ;
 #include <asm/syscalls_64.h>
 #undef __SYSCALL_64
diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
index bff89dfe3619..d6aa6e8315d1 100644
--- a/arch/x86/oprofile/backtrace.c
+++ b/arch/x86/oprofile/backtrace.c
@@ -67,7 +67,7 @@ x86_backtrace_32(struct pt_regs * const regs, unsigned int depth)
 {
         struct stack_frame_ia32 *head;
 
-        /* User process is 32-bit */
+        /* User process is IA32 */
         if (!current || !test_thread_flag(TIF_IA32))
                 return 0;
 
diff --git a/arch/x86/syscalls/Makefile b/arch/x86/syscalls/Makefile
index 564b2476fede..3236aebc828d 100644
--- a/arch/x86/syscalls/Makefile
+++ b/arch/x86/syscalls/Makefile
@@ -10,8 +10,10 @@ syshdr := $(srctree)/$(src)/syscallhdr.sh
 systbl := $(srctree)/$(src)/syscalltbl.sh
 
 quiet_cmd_syshdr = SYSHDR  $@
-      cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' $< $@ \
-                   $(syshdr_abi_$(basetarget)) $(syshdr_pfx_$(basetarget))
+      cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@' \
+                   '$(syshdr_abi_$(basetarget))' \
+                   '$(syshdr_pfx_$(basetarget))' \
+                   '$(syshdr_offset_$(basetarget))'
 quiet_cmd_systbl = SYSTBL  $@
       cmd_systbl = $(CONFIG_SHELL) '$(systbl)' $< $@
 
@@ -24,18 +26,28 @@ syshdr_pfx_unistd_32_ia32 := ia32_
 $(out)/unistd_32_ia32.h: $(syscall32) $(syshdr)
         $(call if_changed,syshdr)
 
-syshdr_abi_unistd_64 := 64
+syshdr_abi_unistd_x32 := common,x32
+syshdr_offset_unistd_x32 := __X32_SYSCALL_BIT
+$(out)/unistd_x32.h: $(syscall64) $(syshdr)
+        $(call if_changed,syshdr)
+
+syshdr_abi_unistd_64 := common,64
 $(out)/unistd_64.h: $(syscall64) $(syshdr)
         $(call if_changed,syshdr)
 
+syshdr_abi_unistd_64_x32 := x32
+syshdr_pfx_unistd_64_x32 := x32_
+$(out)/unistd_64_x32.h: $(syscall64) $(syshdr)
+        $(call if_changed,syshdr)
+
 $(out)/syscalls_32.h: $(syscall32) $(systbl)
         $(call if_changed,systbl)
 $(out)/syscalls_64.h: $(syscall64) $(systbl)
         $(call if_changed,systbl)
 
-syshdr-y                        += unistd_32.h unistd_64.h
+syshdr-y                        += unistd_32.h unistd_64.h unistd_x32.h
 syshdr-y                        += syscalls_32.h
-syshdr-$(CONFIG_X86_64)         += unistd_32_ia32.h
+syshdr-$(CONFIG_X86_64)         += unistd_32_ia32.h unistd_64_x32.h
 syshdr-$(CONFIG_X86_64)         += syscalls_64.h
 
 targets += $(syshdr-y)
diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl
index ce98e287c066..031cef84fe43 100644
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
@@ -181,7 +181,7 @@
 172     i386    prctl                   sys_prctl
 173     i386    rt_sigreturn            ptregs_rt_sigreturn             stub32_rt_sigreturn
 174     i386    rt_sigaction            sys_rt_sigaction                sys32_rt_sigaction
-175     i386    rt_sigprocmask          sys_rt_sigprocmask              sys32_rt_sigprocmask
+175     i386    rt_sigprocmask          sys_rt_sigprocmask
 176     i386    rt_sigpending           sys_rt_sigpending               sys32_rt_sigpending
 177     i386    rt_sigtimedwait         sys_rt_sigtimedwait             compat_sys_rt_sigtimedwait
 178     i386    rt_sigqueueinfo         sys_rt_sigqueueinfo             sys32_rt_sigqueueinfo
diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl
index b440a8f7eefa..dd29a9ea27c5 100644
--- a/arch/x86/syscalls/syscall_64.tbl
+++ b/arch/x86/syscalls/syscall_64.tbl
@@ -4,317 +4,350 @@
 # The format is:
 # <number> <abi> <name> <entry point>
 #
-# The abi is always "64" for this file (for now.)
+# The abi is "common", "64" or "x32" for this file.
 #
-0       64      read                    sys_read
-1       64      write                   sys_write
-2       64      open                    sys_open
-3       64      close                   sys_close
-4       64      stat                    sys_newstat
-5       64      fstat                   sys_newfstat
-6       64      lstat                   sys_newlstat
-7       64      poll                    sys_poll
-8       64      lseek                   sys_lseek
-9       64      mmap                    sys_mmap
-10      64      mprotect                sys_mprotect
-11      64      munmap                  sys_munmap
-12      64      brk                     sys_brk
+0       common  read                    sys_read
+1       common  write                   sys_write
+2       common  open                    sys_open
+3       common  close                   sys_close
+4       common  stat                    sys_newstat
+5       common  fstat                   sys_newfstat
+6       common  lstat                   sys_newlstat
+7       common  poll                    sys_poll
+8       common  lseek                   sys_lseek
+9       common  mmap                    sys_mmap
+10      common  mprotect                sys_mprotect
+11      common  munmap                  sys_munmap
+12      common  brk                     sys_brk
 13      64      rt_sigaction            sys_rt_sigaction
-14      64      rt_sigprocmask          sys_rt_sigprocmask
+14      common  rt_sigprocmask          sys_rt_sigprocmask
 15      64      rt_sigreturn            stub_rt_sigreturn
 16      64      ioctl                   sys_ioctl
-17      64      pread64                 sys_pread64
-18      64      pwrite64                sys_pwrite64
+17      common  pread64                 sys_pread64
+18      common  pwrite64                sys_pwrite64
 19      64      readv                   sys_readv
 20      64      writev                  sys_writev
-21      64      access                  sys_access
-22      64      pipe                    sys_pipe
-23      64      select                  sys_select
-24      64      sched_yield             sys_sched_yield
-25      64      mremap                  sys_mremap
-26      64      msync                   sys_msync
-27      64      mincore                 sys_mincore
-28      64      madvise                 sys_madvise
-29      64      shmget                  sys_shmget
-30      64      shmat                   sys_shmat
-31      64      shmctl                  sys_shmctl
-32      64      dup                     sys_dup
-33      64      dup2                    sys_dup2
-34      64      pause                   sys_pause
-35      64      nanosleep               sys_nanosleep
-36      64      getitimer               sys_getitimer
-37      64      alarm                   sys_alarm
-38      64      setitimer               sys_setitimer
-39      64      getpid                  sys_getpid
-40      64      sendfile                sys_sendfile64
-41      64      socket                  sys_socket
-42      64      connect                 sys_connect
-43      64      accept                  sys_accept
-44      64      sendto                  sys_sendto
+21      common  access                  sys_access
+22      common  pipe                    sys_pipe
+23      common  select                  sys_select
+24      common  sched_yield             sys_sched_yield
+25      common  mremap                  sys_mremap
+26      common  msync                   sys_msync
+27      common  mincore                 sys_mincore
+28      common  madvise                 sys_madvise
+29      common  shmget                  sys_shmget
+30      common  shmat                   sys_shmat
+31      common  shmctl                  sys_shmctl
+32      common  dup                     sys_dup
+33      common  dup2                    sys_dup2
+34      common  pause                   sys_pause
+35      common  nanosleep               sys_nanosleep
+36      common  getitimer               sys_getitimer
+37      common  alarm                   sys_alarm
+38      common  setitimer               sys_setitimer
+39      common  getpid                  sys_getpid
+40      common  sendfile                sys_sendfile64
+41      common  socket                  sys_socket
+42      common  connect                 sys_connect
+43      common  accept                  sys_accept
+44      common  sendto                  sys_sendto
 45      64      recvfrom                sys_recvfrom
 46      64      sendmsg                 sys_sendmsg
 47      64      recvmsg                 sys_recvmsg
-48      64      shutdown                sys_shutdown
-49      64      bind                    sys_bind
-50      64      listen                  sys_listen
-51      64      getsockname             sys_getsockname
-52      64      getpeername             sys_getpeername
-53      64      socketpair              sys_socketpair
-54      64      setsockopt              sys_setsockopt
-55      64      getsockopt              sys_getsockopt
-56      64      clone                   stub_clone
-57      64      fork                    stub_fork
-58      64      vfork                   stub_vfork
+48      common  shutdown                sys_shutdown
+49      common  bind                    sys_bind
+50      common  listen                  sys_listen
+51      common  getsockname             sys_getsockname
+52      common  getpeername             sys_getpeername
+53      common  socketpair              sys_socketpair
+54      common  setsockopt              sys_setsockopt
+55      common  getsockopt              sys_getsockopt
+56      common  clone                   stub_clone
+57      common  fork                    stub_fork
+58      common  vfork                   stub_vfork
 59      64      execve                  stub_execve
-60      64      exit                    sys_exit
-61      64      wait4                   sys_wait4
-62      64      kill                    sys_kill
-63      64      uname                   sys_newuname
-64      64      semget                  sys_semget
-65      64      semop                   sys_semop
-66      64      semctl                  sys_semctl
-67      64      shmdt                   sys_shmdt
-68      64      msgget                  sys_msgget
-69      64      msgsnd                  sys_msgsnd
-70      64      msgrcv                  sys_msgrcv
-71      64      msgctl                  sys_msgctl
-72      64      fcntl                   sys_fcntl
-73      64      flock                   sys_flock
-74      64      fsync                   sys_fsync
-75      64      fdatasync               sys_fdatasync
-76      64      truncate                sys_truncate
-77      64      ftruncate               sys_ftruncate
-78      64      getdents                sys_getdents
-79      64      getcwd                  sys_getcwd
-80      64      chdir                   sys_chdir
-81      64      fchdir                  sys_fchdir
-82      64      rename                  sys_rename
-83      64      mkdir                   sys_mkdir
-84      64      rmdir                   sys_rmdir
-85      64      creat                   sys_creat
-86      64      link                    sys_link
-87      64      unlink                  sys_unlink
-88      64      symlink                 sys_symlink
-89      64      readlink                sys_readlink
-90      64      chmod                   sys_chmod
-91      64      fchmod                  sys_fchmod
-92      64      chown                   sys_chown
-93      64      fchown                  sys_fchown
-94      64      lchown                  sys_lchown
-95      64      umask                   sys_umask
-96      64      gettimeofday            sys_gettimeofday
-97      64      getrlimit               sys_getrlimit
-98      64      getrusage               sys_getrusage
-99      64      sysinfo                 sys_sysinfo
-100     64      times                   sys_times
+60      common  exit                    sys_exit
+61      common  wait4                   sys_wait4
+62      common  kill                    sys_kill
+63      common  uname                   sys_newuname
+64      common  semget                  sys_semget
+65      common  semop                   sys_semop
+66      common  semctl                  sys_semctl
+67      common  shmdt                   sys_shmdt
+68      common  msgget                  sys_msgget
+69      common  msgsnd                  sys_msgsnd
+70      common  msgrcv                  sys_msgrcv
+71      common  msgctl                  sys_msgctl
+72      common  fcntl                   sys_fcntl
+73      common  flock                   sys_flock
+74      common  fsync                   sys_fsync
+75      common  fdatasync               sys_fdatasync
+76      common  truncate                sys_truncate
+77      common  ftruncate               sys_ftruncate
+78      common  getdents                sys_getdents
+79      common  getcwd                  sys_getcwd
+80      common  chdir                   sys_chdir
+81      common  fchdir                  sys_fchdir
+82      common  rename                  sys_rename
+83      common  mkdir                   sys_mkdir
+84      common  rmdir                   sys_rmdir
+85      common  creat                   sys_creat
+86      common  link                    sys_link
+87      common  unlink                  sys_unlink
+88      common  symlink                 sys_symlink
+89      common  readlink                sys_readlink
+90      common  chmod                   sys_chmod
+91      common  fchmod                  sys_fchmod
+92      common  chown                   sys_chown
+93      common  fchown                  sys_fchown
+94      common  lchown                  sys_lchown
+95      common  umask                   sys_umask
+96      common  gettimeofday            sys_gettimeofday
+97      common  getrlimit               sys_getrlimit
+98      common  getrusage               sys_getrusage
+99      common  sysinfo                 sys_sysinfo
+100     common  times                   sys_times
 101     64      ptrace                  sys_ptrace
-102     64      getuid                  sys_getuid
-103     64      syslog                  sys_syslog
-104     64      getgid                  sys_getgid
-105     64      setuid                  sys_setuid
-106     64      setgid                  sys_setgid
-107     64      geteuid                 sys_geteuid
-108     64      getegid                 sys_getegid
-109     64      setpgid                 sys_setpgid
-110     64      getppid                 sys_getppid
-111     64      getpgrp                 sys_getpgrp
-112     64      setsid                  sys_setsid
-113     64      setreuid                sys_setreuid
-114     64      setregid                sys_setregid
-115     64      getgroups               sys_getgroups
-116     64      setgroups               sys_setgroups
-117     64      setresuid               sys_setresuid
-118     64      getresuid               sys_getresuid
-119     64      setresgid               sys_setresgid
-120     64      getresgid               sys_getresgid
-121     64      getpgid                 sys_getpgid
-122     64      setfsuid                sys_setfsuid
-123     64      setfsgid                sys_setfsgid
-124     64      getsid                  sys_getsid
-125     64      capget                  sys_capget
-126     64      capset                  sys_capset
+102     common  getuid                  sys_getuid
+103     common  syslog                  sys_syslog
+104     common  getgid                  sys_getgid
+105     common  setuid                  sys_setuid
+106     common  setgid                  sys_setgid
+107     common  geteuid                 sys_geteuid
+108     common  getegid                 sys_getegid
+109     common  setpgid                 sys_setpgid
+110     common  getppid                 sys_getppid
+111     common  getpgrp                 sys_getpgrp
+112     common  setsid                  sys_setsid
+113     common  setreuid                sys_setreuid
+114     common  setregid                sys_setregid
+115     common  getgroups               sys_getgroups
+116     common  setgroups               sys_setgroups
+117     common  setresuid               sys_setresuid
+118     common  getresuid               sys_getresuid
+119     common  setresgid               sys_setresgid
+120     common  getresgid               sys_getresgid
+121     common  getpgid                 sys_getpgid
+122     common  setfsuid                sys_setfsuid
+123     common  setfsgid                sys_setfsgid
+124     common  getsid                  sys_getsid
+125     common  capget                  sys_capget
+126     common  capset                  sys_capset
 127     64      rt_sigpending           sys_rt_sigpending
 128     64      rt_sigtimedwait         sys_rt_sigtimedwait
 129     64      rt_sigqueueinfo         sys_rt_sigqueueinfo
-130     64      rt_sigsuspend           sys_rt_sigsuspend
+130     common  rt_sigsuspend           sys_rt_sigsuspend
 131     64      sigaltstack             stub_sigaltstack
-132     64      utime                   sys_utime
-133     64      mknod                   sys_mknod
+132     common  utime                   sys_utime
+133     common  mknod                   sys_mknod
 134     64      uselib
-135     64      personality             sys_personality
-136     64      ustat                   sys_ustat
-137     64      statfs                  sys_statfs
-138     64      fstatfs                 sys_fstatfs
-139     64      sysfs                   sys_sysfs
-140     64      getpriority             sys_getpriority
-141     64      setpriority             sys_setpriority
-142     64      sched_setparam          sys_sched_setparam
-143     64      sched_getparam          sys_sched_getparam
-144     64      sched_setscheduler      sys_sched_setscheduler
-145     64      sched_getscheduler      sys_sched_getscheduler
-146     64      sched_get_priority_max  sys_sched_get_priority_max
-147     64      sched_get_priority_min  sys_sched_get_priority_min
-148     64      sched_rr_get_interval   sys_sched_rr_get_interval
-149     64      mlock                   sys_mlock
-150     64      munlock                 sys_munlock
-151     64      mlockall                sys_mlockall
-152     64      munlockall              sys_munlockall
-153     64      vhangup                 sys_vhangup
-154     64      modify_ldt              sys_modify_ldt
-155     64      pivot_root              sys_pivot_root
+135     common  personality             sys_personality
+136     common  ustat                   sys_ustat
+137     common  statfs                  sys_statfs
+138     common  fstatfs                 sys_fstatfs
+139     common  sysfs                   sys_sysfs
+140     common  getpriority             sys_getpriority
+141     common  setpriority             sys_setpriority
+142     common  sched_setparam          sys_sched_setparam
+143     common  sched_getparam          sys_sched_getparam
+144     common  sched_setscheduler      sys_sched_setscheduler
+145     common  sched_getscheduler      sys_sched_getscheduler
+146     common  sched_get_priority_max  sys_sched_get_priority_max
+147     common  sched_get_priority_min  sys_sched_get_priority_min
+148     common  sched_rr_get_interval   sys_sched_rr_get_interval
+149     common  mlock                   sys_mlock
+150     common  munlock                 sys_munlock
+151     common  mlockall                sys_mlockall
+152     common  munlockall              sys_munlockall
+153     common  vhangup                 sys_vhangup
+154     common  modify_ldt              sys_modify_ldt
+155     common  pivot_root              sys_pivot_root
 156     64      _sysctl                 sys_sysctl
-157     64      prctl                   sys_prctl
-158     64      arch_prctl              sys_arch_prctl
-159     64      adjtimex                sys_adjtimex
-160     64      setrlimit               sys_setrlimit
-161     64      chroot                  sys_chroot
-162     64      sync                    sys_sync
-163     64      acct                    sys_acct
-164     64      settimeofday            sys_settimeofday
-165     64      mount                   sys_mount
-166     64      umount2                 sys_umount
-167     64      swapon                  sys_swapon
-168     64      swapoff                 sys_swapoff
-169     64      reboot                  sys_reboot
-170     64      sethostname             sys_sethostname
-171     64      setdomainname           sys_setdomainname
-172     64      iopl                    stub_iopl
-173     64      ioperm                  sys_ioperm
+157     common  prctl                   sys_prctl
+158     common  arch_prctl              sys_arch_prctl
+159     common  adjtimex                sys_adjtimex
+160     common  setrlimit               sys_setrlimit
+161     common  chroot                  sys_chroot
+162     common  sync                    sys_sync
+163     common  acct                    sys_acct
+164     common  settimeofday            sys_settimeofday
+165     common  mount                   sys_mount
+166     common  umount2                 sys_umount
+167     common  swapon                  sys_swapon
+168     common  swapoff                 sys_swapoff
+169     common  reboot                  sys_reboot
+170     common  sethostname             sys_sethostname
+171     common  setdomainname           sys_setdomainname
+172     common  iopl                    stub_iopl
+173     common  ioperm                  sys_ioperm
 174     64      create_module
-175     64      init_module             sys_init_module
-176     64      delete_module           sys_delete_module
+175     common  init_module             sys_init_module
+176     common  delete_module           sys_delete_module
 177     64      get_kernel_syms
 178     64      query_module
-179     64      quotactl                sys_quotactl
+179     common  quotactl                sys_quotactl
 180     64      nfsservctl
-181     64      getpmsg
-182     64      putpmsg
-183     64      afs_syscall
-184     64      tuxcall
-185     64      security
-186     64      gettid                  sys_gettid
-187     64      readahead               sys_readahead
-188     64      setxattr                sys_setxattr
-189     64      lsetxattr               sys_lsetxattr
-190     64      fsetxattr               sys_fsetxattr
-191     64      getxattr                sys_getxattr
-192     64      lgetxattr               sys_lgetxattr
-193     64      fgetxattr               sys_fgetxattr
-194     64      listxattr               sys_listxattr
-195     64      llistxattr              sys_llistxattr
-196     64      flistxattr              sys_flistxattr
-197     64      removexattr             sys_removexattr
-198     64      lremovexattr            sys_lremovexattr
-199     64      fremovexattr            sys_fremovexattr
-200     64      tkill                   sys_tkill
-201     64      time                    sys_time
-202     64      futex                   sys_futex
-203     64      sched_setaffinity       sys_sched_setaffinity
-204     64      sched_getaffinity       sys_sched_getaffinity
+181     common  getpmsg
+182     common  putpmsg
+183     common  afs_syscall
+184     common  tuxcall
+185     common  security
+186     common  gettid                  sys_gettid
+187     common  readahead               sys_readahead
+188     common  setxattr                sys_setxattr
+189     common  lsetxattr               sys_lsetxattr
+190     common  fsetxattr               sys_fsetxattr
+191     common  getxattr                sys_getxattr
+192     common  lgetxattr               sys_lgetxattr
+193     common  fgetxattr               sys_fgetxattr
+194     common  listxattr               sys_listxattr
+195     common  llistxattr              sys_llistxattr
+196     common  flistxattr              sys_flistxattr
+197     common  removexattr             sys_removexattr
+198     common  lremovexattr            sys_lremovexattr
+199     common  fremovexattr            sys_fremovexattr
+200     common  tkill                   sys_tkill
+201     common  time                    sys_time
+202     common  futex                   sys_futex
+203     common  sched_setaffinity       sys_sched_setaffinity
+204     common  sched_getaffinity       sys_sched_getaffinity
 205     64      set_thread_area
-206     64      io_setup                sys_io_setup
-207     64      io_destroy              sys_io_destroy
-208     64      io_getevents            sys_io_getevents
-209     64      io_submit               sys_io_submit
-210     64      io_cancel               sys_io_cancel
+206     common  io_setup                sys_io_setup
+207     common  io_destroy              sys_io_destroy
+208     common  io_getevents            sys_io_getevents
+209     common  io_submit               sys_io_submit
+210     common  io_cancel               sys_io_cancel
 211     64      get_thread_area
-212     64      lookup_dcookie          sys_lookup_dcookie
-213     64      epoll_create            sys_epoll_create
+212     common  lookup_dcookie          sys_lookup_dcookie
+213     common  epoll_create            sys_epoll_create
 214     64      epoll_ctl_old
 215     64      epoll_wait_old
-216     64      remap_file_pages        sys_remap_file_pages
-217     64      getdents64              sys_getdents64
-218     64      set_tid_address         sys_set_tid_address
-219     64      restart_syscall         sys_restart_syscall
-220     64      semtimedop              sys_semtimedop
-221     64      fadvise64               sys_fadvise64
+216     common  remap_file_pages        sys_remap_file_pages
+217     common  getdents64              sys_getdents64
+218     common  set_tid_address         sys_set_tid_address
+219     common  restart_syscall         sys_restart_syscall
+220     common  semtimedop              sys_semtimedop
+221     common  fadvise64               sys_fadvise64
 222     64      timer_create            sys_timer_create
-223     64      timer_settime           sys_timer_settime
-224     64      timer_gettime           sys_timer_gettime
-225     64      timer_getoverrun        sys_timer_getoverrun
-226     64      timer_delete            sys_timer_delete
-227     64      clock_settime           sys_clock_settime
-228     64      clock_gettime           sys_clock_gettime
-229     64      clock_getres            sys_clock_getres
-230     64      clock_nanosleep         sys_clock_nanosleep
-231     64      exit_group              sys_exit_group
-232     64      epoll_wait              sys_epoll_wait
-233     64      epoll_ctl               sys_epoll_ctl
-234     64      tgkill                  sys_tgkill
-235     64      utimes                  sys_utimes
+223     common  timer_settime           sys_timer_settime
+224     common  timer_gettime           sys_timer_gettime
+225     common  timer_getoverrun        sys_timer_getoverrun
+226     common  timer_delete            sys_timer_delete
+227     common  clock_settime           sys_clock_settime
+228     common  clock_gettime           sys_clock_gettime
+229     common  clock_getres            sys_clock_getres
+230     common  clock_nanosleep         sys_clock_nanosleep
+231     common  exit_group              sys_exit_group
+232     common  epoll_wait              sys_epoll_wait
+233     common  epoll_ctl               sys_epoll_ctl
+234     common  tgkill                  sys_tgkill
+235     common  utimes                  sys_utimes
 236     64      vserver
-237     64      mbind                   sys_mbind
-238     64      set_mempolicy           sys_set_mempolicy
-239     64      get_mempolicy           sys_get_mempolicy
-240     64      mq_open                 sys_mq_open
-241     64      mq_unlink               sys_mq_unlink
-242     64      mq_timedsend            sys_mq_timedsend
-243     64      mq_timedreceive         sys_mq_timedreceive
+237     common  mbind                   sys_mbind
+238     common  set_mempolicy           sys_set_mempolicy
+239     common  get_mempolicy           sys_get_mempolicy
+240     common  mq_open                 sys_mq_open
+241     common  mq_unlink               sys_mq_unlink
+242     common  mq_timedsend            sys_mq_timedsend
+243     common  mq_timedreceive         sys_mq_timedreceive
 244     64      mq_notify               sys_mq_notify
-245     64      mq_getsetattr           sys_mq_getsetattr
+245     common  mq_getsetattr           sys_mq_getsetattr
 246     64      kexec_load              sys_kexec_load
 247     64      waitid                  sys_waitid
-248     64      add_key                 sys_add_key
-249     64      request_key             sys_request_key
-250     64      keyctl                  sys_keyctl
-251     64      ioprio_set              sys_ioprio_set
-252     64      ioprio_get              sys_ioprio_get
-253     64      inotify_init            sys_inotify_init
-254     64      inotify_add_watch       sys_inotify_add_watch
-255     64      inotify_rm_watch        sys_inotify_rm_watch
-256     64      migrate_pages           sys_migrate_pages
-257     64      openat                  sys_openat
-258     64      mkdirat                 sys_mkdirat
-259     64      mknodat                 sys_mknodat
-260     64      fchownat                sys_fchownat
-261     64      futimesat               sys_futimesat
-262     64      newfstatat              sys_newfstatat
-263     64      unlinkat                sys_unlinkat
-264     64      renameat                sys_renameat
-265     64      linkat                  sys_linkat
-266     64      symlinkat               sys_symlinkat
-267     64      readlinkat              sys_readlinkat
-268     64      fchmodat                sys_fchmodat
-269     64      faccessat               sys_faccessat
-270     64      pselect6                sys_pselect6
-271     64      ppoll                   sys_ppoll
-272     64      unshare                 sys_unshare
+248     common  add_key                 sys_add_key
+249     common  request_key             sys_request_key
+250     common  keyctl                  sys_keyctl
+251     common  ioprio_set              sys_ioprio_set
+252     common  ioprio_get              sys_ioprio_get
+253     common  inotify_init            sys_inotify_init
+254     common  inotify_add_watch       sys_inotify_add_watch
+255     common  inotify_rm_watch        sys_inotify_rm_watch
+256     common  migrate_pages           sys_migrate_pages
+257     common  openat                  sys_openat
+258     common  mkdirat                 sys_mkdirat
+259     common  mknodat                 sys_mknodat
+260     common  fchownat                sys_fchownat
+261     common  futimesat               sys_futimesat
+262     common  newfstatat              sys_newfstatat
+263     common  unlinkat                sys_unlinkat
+264     common  renameat                sys_renameat
+265     common  linkat                  sys_linkat
+266     common  symlinkat               sys_symlinkat
+267     common  readlinkat              sys_readlinkat
+268     common  fchmodat                sys_fchmodat
+269     common  faccessat               sys_faccessat
+270     common  pselect6                sys_pselect6
+271     common  ppoll                   sys_ppoll
+272     common  unshare                 sys_unshare
 273     64      set_robust_list         sys_set_robust_list
 274     64      get_robust_list         sys_get_robust_list
-275     64      splice                  sys_splice
-276     64      tee                     sys_tee
-277     64      sync_file_range         sys_sync_file_range
+275     common  splice                  sys_splice
+276     common  tee                     sys_tee
+277     common  sync_file_range         sys_sync_file_range
 278     64      vmsplice                sys_vmsplice
 279     64      move_pages              sys_move_pages
-280     64      utimensat               sys_utimensat
-281     64      epoll_pwait             sys_epoll_pwait
-282     64      signalfd                sys_signalfd
-283     64      timerfd_create          sys_timerfd_create
-284     64      eventfd                 sys_eventfd
-285     64      fallocate               sys_fallocate
-286     64      timerfd_settime         sys_timerfd_settime
-287     64      timerfd_gettime         sys_timerfd_gettime
-288     64      accept4                 sys_accept4
-289     64      signalfd4               sys_signalfd4
-290     64      eventfd2                sys_eventfd2
-291     64      epoll_create1           sys_epoll_create1
-292     64      dup3                    sys_dup3
-293     64      pipe2                   sys_pipe2
-294     64      inotify_init1           sys_inotify_init1
+280     common  utimensat               sys_utimensat
+281     common  epoll_pwait             sys_epoll_pwait
+282     common  signalfd                sys_signalfd
+283     common  timerfd_create          sys_timerfd_create
+284     common  eventfd                 sys_eventfd
+285     common  fallocate               sys_fallocate
+286     common  timerfd_settime         sys_timerfd_settime
+287     common  timerfd_gettime         sys_timerfd_gettime
+288     common  accept4                 sys_accept4
+289     common  signalfd4               sys_signalfd4
+290     common  eventfd2                sys_eventfd2
+291     common  epoll_create1           sys_epoll_create1
+292     common  dup3                    sys_dup3
+293     common  pipe2                   sys_pipe2
+294     common  inotify_init1           sys_inotify_init1
 295     64      preadv                  sys_preadv
 296     64      pwritev                 sys_pwritev
 297     64      rt_tgsigqueueinfo       sys_rt_tgsigqueueinfo
-298     64      perf_event_open         sys_perf_event_open
+298     common  perf_event_open         sys_perf_event_open
 299     64      recvmmsg                sys_recvmmsg
-300     64      fanotify_init           sys_fanotify_init
-301     64      fanotify_mark           sys_fanotify_mark
-302     64      prlimit64               sys_prlimit64
-303     64      name_to_handle_at       sys_name_to_handle_at
-304     64      open_by_handle_at       sys_open_by_handle_at
-305     64      clock_adjtime           sys_clock_adjtime
-306     64      syncfs                  sys_syncfs
+300     common  fanotify_init           sys_fanotify_init
+301     common  fanotify_mark           sys_fanotify_mark
+302     common  prlimit64               sys_prlimit64
+303     common  name_to_handle_at       sys_name_to_handle_at
+304     common  open_by_handle_at       sys_open_by_handle_at
+305     common  clock_adjtime           sys_clock_adjtime
+306     common  syncfs                  sys_syncfs
 307     64      sendmmsg                sys_sendmmsg
-308     64      setns                   sys_setns
-309     64      getcpu                  sys_getcpu
+308     common  setns                   sys_setns
+309     common  getcpu                  sys_getcpu
 310     64      process_vm_readv        sys_process_vm_readv
 311     64      process_vm_writev       sys_process_vm_writev
+#
+# x32-specific system call numbers start at 512 to avoid cache impact
+# for native 64-bit operation.
+#
+512     x32     rt_sigaction            sys32_rt_sigaction
+513     x32     rt_sigreturn            stub_x32_rt_sigreturn
+514     x32     ioctl                   compat_sys_ioctl
+515     x32     readv                   compat_sys_readv
+516     x32     writev                  compat_sys_writev
+517     x32     recvfrom                compat_sys_recvfrom
+518     x32     sendmsg                 compat_sys_sendmsg
+519     x32     recvmsg                 compat_sys_recvmsg
+520     x32     execve                  stub_x32_execve
+521     x32     ptrace                  compat_sys_ptrace
+522     x32     rt_sigpending           sys32_rt_sigpending
+523     x32     rt_sigtimedwait         compat_sys_rt_sigtimedwait
+524     x32     rt_sigqueueinfo         sys32_rt_sigqueueinfo
+525     x32     sigaltstack             stub_x32_sigaltstack
+526     x32     timer_create            compat_sys_timer_create
+527     x32     mq_notify               compat_sys_mq_notify
+528     x32     kexec_load              compat_sys_kexec_load
+529     x32     waitid                  compat_sys_waitid
+530     x32     set_robust_list         compat_sys_set_robust_list
+531     x32     get_robust_list         compat_sys_get_robust_list
+532     x32     vmsplice                compat_sys_vmsplice
+533     x32     move_pages              compat_sys_move_pages
+534     x32     preadv                  compat_sys_preadv64
+535     x32     pwritev                 compat_sys_pwritev64
+536     x32     rt_tgsigqueueinfo       compat_sys_rt_tgsigqueueinfo
+537     x32     recvmmsg                compat_sys_recvmmsg
+538     x32     sendmmsg                compat_sys_sendmmsg
+539     x32     process_vm_readv        compat_sys_process_vm_readv
+540     x32     process_vm_writev       compat_sys_process_vm_writev
diff --git a/arch/x86/um/sys_call_table_64.c b/arch/x86/um/sys_call_table_64.c
index fe626c3ba01b..9924776f4265 100644
--- a/arch/x86/um/sys_call_table_64.c
+++ b/arch/x86/um/sys_call_table_64.c
@@ -35,6 +35,9 @@
 #define stub_sigaltstack sys_sigaltstack
 #define stub_rt_sigreturn sys_rt_sigreturn
 
+#define __SYSCALL_COMMON(nr, sym, compat) __SYSCALL_64(nr, sym, compat)
+#define __SYSCALL_X32(nr, sym, compat) /* Not supported */
+
 #define __SYSCALL_64(nr, sym, compat) extern asmlinkage void sym(void) ;
 #include <asm/syscalls_64.h>
 
diff --git a/arch/x86/um/user-offsets.c b/arch/x86/um/user-offsets.c
index 5edf4f4bbf53..ce7e3607a870 100644
--- a/arch/x86/um/user-offsets.c
+++ b/arch/x86/um/user-offsets.c
@@ -15,6 +15,8 @@ static char syscalls[] = {
 };
 #else
 #define __SYSCALL_64(nr, sym, compat) [nr] = 1,
+#define __SYSCALL_COMMON(nr, sym, compat) [nr] = 1,
+#define __SYSCALL_X32(nr, sym, compat) /* Not supported */
 static char syscalls[] = {
 #include <asm/syscalls_64.h>
 };
diff --git a/arch/x86/vdso/.gitignore b/arch/x86/vdso/.gitignore
index 60274d5746e1..3282874bc61d 100644
--- a/arch/x86/vdso/.gitignore
+++ b/arch/x86/vdso/.gitignore
@@ -1,5 +1,7 @@
 vdso.lds
 vdso-syms.lds
+vdsox32.lds
+vdsox32-syms.lds
 vdso32-syms.lds
 vdso32-syscall-syms.lds
 vdso32-sysenter-syms.lds
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index 5d179502a52c..fd14be1d1472 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -3,21 +3,29 @@
 #
 
 VDSO64-$(CONFIG_X86_64)         := y
+VDSOX32-$(CONFIG_X86_X32_ABI)   := y
 VDSO32-$(CONFIG_X86_32)         := y
 VDSO32-$(CONFIG_COMPAT)         := y
 
 vdso-install-$(VDSO64-y)        += vdso.so
+vdso-install-$(VDSOX32-y)       += vdsox32.so
 vdso-install-$(VDSO32-y)        += $(vdso32-images)
 
 
 # files to link into the vdso
 vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o
 
+vobjs-$(VDSOX32-y) += $(vobjx32s-compat)
+
+# Filter out x32 objects.
+vobj64s := $(filter-out $(vobjx32s-compat),$(vobjs-y))
+
 # files to link into kernel
 obj-$(VDSO64-y)                 += vma.o vdso.o
+obj-$(VDSOX32-y)                += vdsox32.o
 obj-$(VDSO32-y)                 += vdso32.o vdso32-setup.o
 
-vobjs := $(foreach F,$(vobjs-y),$(obj)/$F)
+vobjs := $(foreach F,$(vobj64s),$(obj)/$F)
 
 $(obj)/vdso.o: $(obj)/vdso.so
 
@@ -73,6 +81,42 @@ $(obj)/%-syms.lds: $(obj)/%.so.dbg FORCE
         $(call if_changed,vdsosym)
 
 #
+# X32 processes use x32 vDSO to access 64bit kernel data.
+#
+# Build x32 vDSO image:
+# 1. Compile x32 vDSO as 64bit.
+# 2. Convert object files to x32.
+# 3. Build x32 VDSO image with x32 objects, which contains 64bit codes
+# so that it can reach 64bit address space with 64bit pointers.
+#
+
+targets += vdsox32-syms.lds
+obj-$(VDSOX32-y)                += vdsox32-syms.lds
+
+CPPFLAGS_vdsox32.lds = $(CPPFLAGS_vdso.lds)
+VDSO_LDFLAGS_vdsox32.lds = -Wl,-m,elf32_x86_64 \
+                           -Wl,-soname=linux-vdso.so.1 \
+                           -Wl,-z,max-page-size=4096 \
+                           -Wl,-z,common-page-size=4096
+
+vobjx32s-y := $(vobj64s:.o=-x32.o)
+vobjx32s := $(foreach F,$(vobjx32s-y),$(obj)/$F)
+
+# Convert 64bit object file to x32 for x32 vDSO.
+quiet_cmd_x32 = X32     $@
+      cmd_x32 = $(OBJCOPY) -O elf32-x86-64 $< $@
+
+$(obj)/%-x32.o: $(obj)/%.o FORCE
+        $(call if_changed,x32)
+
+targets += vdsox32.so vdsox32.so.dbg vdsox32.lds $(vobjx32s-y)
+
+$(obj)/vdsox32.o: $(src)/vdsox32.S $(obj)/vdsox32.so
+
+$(obj)/vdsox32.so.dbg: $(src)/vdsox32.lds $(vobjx32s) FORCE
+        $(call if_changed,vdso)
+
+#
 # Build multiple 32-bit vDSO images to choose from at boot time.
 #
 obj-$(VDSO32-y)                 += vdso32-syms.lds
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index 468d591dde31..10f9f59477db 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -317,6 +317,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
         int ret = 0;
         bool compat;
 
+#ifdef CONFIG_X86_X32_ABI
+        if (test_thread_flag(TIF_X32))
+                return x32_setup_additional_pages(bprm, uses_interp);
+#endif
+
         if (vdso_enabled == VDSO_DISABLED)
                 return 0;
 
diff --git a/arch/x86/vdso/vdsox32.S b/arch/x86/vdso/vdsox32.S
new file mode 100644
index 000000000000..d6b9a7f42a8a
--- /dev/null
+++ b/arch/x86/vdso/vdsox32.S
@@ -0,0 +1,22 @@
+#include <asm/page_types.h>
+#include <linux/linkage.h>
+#include <linux/init.h>
+
+__PAGE_ALIGNED_DATA
+
+        .globl vdsox32_start, vdsox32_end
+        .align PAGE_SIZE
+vdsox32_start:
+        .incbin "arch/x86/vdso/vdsox32.so"
+vdsox32_end:
+        .align PAGE_SIZE /* extra data here leaks to userspace. */
+
+.previous
+
+        .globl vdsox32_pages
+        .bss
+        .align 8
+        .type vdsox32_pages, @object
+vdsox32_pages:
+        .zero (vdsox32_end - vdsox32_start + PAGE_SIZE - 1) / PAGE_SIZE * 8
+        .size vdsox32_pages, .-vdsox32_pages
diff --git a/arch/x86/vdso/vdsox32.lds.S b/arch/x86/vdso/vdsox32.lds.S
new file mode 100644
index 000000000000..62272aa2ae0a
--- /dev/null
+++ b/arch/x86/vdso/vdsox32.lds.S
@@ -0,0 +1,28 @@
+/*
+ * Linker script for x32 vDSO.
+ * We #include the file to define the layout details.
+ * Here we only choose the prelinked virtual address.
+ *
+ * This file defines the version script giving the user-exported symbols in
+ * the DSO.  We can define local symbols here called VDSO* to make their
+ * values visible using the asm-x86/vdso.h macros from the kernel proper.
+ */
+
+#define VDSO_PRELINK 0
+#include "vdso-layout.lds.S"
+
+/*
+ * This controls what userland symbols we export from the vDSO.
+ */
+VERSION {
+        LINUX_2.6 {
+        global:
+                __vdso_clock_gettime;
+                __vdso_gettimeofday;
+                __vdso_getcpu;
+                __vdso_time;
+        local: *;
+        };
+}
+
+VDSOX32_PRELINK = VDSO_PRELINK;
diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
index 153407c35b75..d7dce1dbf8c9 100644
--- a/arch/x86/vdso/vma.c
+++ b/arch/x86/vdso/vma.c
@@ -24,7 +24,44 @@ extern unsigned short vdso_sync_cpuid;
 extern struct page *vdso_pages[];
 static unsigned vdso_size;
 
-static void __init patch_vdso(void *vdso, size_t len)
+#ifdef CONFIG_X86_X32_ABI
+extern char vdsox32_start[], vdsox32_end[];
+extern struct page *vdsox32_pages[];
+static unsigned vdsox32_size;
+
+static void __init patch_vdsox32(void *vdso, size_t len)
+{
+        Elf32_Ehdr *hdr = vdso;
+        Elf32_Shdr *sechdrs, *alt_sec = 0;
+        char *secstrings;
+        void *alt_data;
+        int i;
+
+        BUG_ON(len < sizeof(Elf32_Ehdr));
+        BUG_ON(memcmp(hdr->e_ident, ELFMAG, SELFMAG) != 0);
+
+        sechdrs = (void *)hdr + hdr->e_shoff;
+        secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
+
+        for (i = 1; i < hdr->e_shnum; i++) {
+                Elf32_Shdr *shdr = &sechdrs[i];
+                if (!strcmp(secstrings + shdr->sh_name, ".altinstructions")) {
+                        alt_sec = shdr;
+                        goto found;
+                }
+        }
+
+        /* If we get here, it's probably a bug. */
+        pr_warning("patch_vdsox32: .altinstructions not found\n");
+        return;  /* nothing to patch */
+
+found:
+        alt_data = (void *)hdr + alt_sec->sh_offset;
+        apply_alternatives(alt_data, alt_data + alt_sec->sh_size);
+}
+#endif
+
+static void __init patch_vdso64(void *vdso, size_t len)
 {
         Elf64_Ehdr *hdr = vdso;
         Elf64_Shdr *sechdrs, *alt_sec = 0;
@@ -47,7 +84,7 @@ static void __init patch_vdso(void *vdso, size_t len)
         }
 
         /* If we get here, it's probably a bug. */
-        pr_warning("patch_vdso: .altinstructions not found\n");
+        pr_warning("patch_vdso64: .altinstructions not found\n");
         return;  /* nothing to patch */
 
 found:
@@ -60,12 +97,20 @@ static int __init init_vdso(void)
         int npages = (vdso_end - vdso_start + PAGE_SIZE - 1) / PAGE_SIZE;
         int i;
 
-        patch_vdso(vdso_start, vdso_end - vdso_start);
+        patch_vdso64(vdso_start, vdso_end - vdso_start);
 
         vdso_size = npages << PAGE_SHIFT;
         for (i = 0; i < npages; i++)
                 vdso_pages[i] = virt_to_page(vdso_start + i*PAGE_SIZE);
 
+#ifdef CONFIG_X86_X32_ABI
+        patch_vdsox32(vdsox32_start, vdsox32_end - vdsox32_start);
+        npages = (vdsox32_end - vdsox32_start + PAGE_SIZE - 1) / PAGE_SIZE;
+        vdsox32_size = npages << PAGE_SHIFT;
+        for (i = 0; i < npages; i++)
+                vdsox32_pages[i] = virt_to_page(vdsox32_start + i*PAGE_SIZE);
+#endif
+
         return 0;
 }
 subsys_initcall(init_vdso);
@@ -103,7 +148,10 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
 
 /* Setup a VMA at program startup for the vsyscall page.
    Not called for compat tasks */
-int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+static int setup_additional_pages(struct linux_binprm *bprm,
+                                  int uses_interp,
+                                  struct page **pages,
+                                  unsigned size)
 {
         struct mm_struct *mm = current->mm;
         unsigned long addr;
@@ -113,8 +161,8 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
                 return 0;
 
         down_write(&mm->mmap_sem);
-        addr = vdso_addr(mm->start_stack, vdso_size);
-        addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
+        addr = vdso_addr(mm->start_stack, size);
+        addr = get_unmapped_area(NULL, addr, size, 0, 0);
         if (IS_ERR_VALUE(addr)) {
                 ret = addr;
                 goto up_fail;
@@ -122,11 +170,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
 
         current->mm->context.vdso = (void *)addr;
 
-        ret = install_special_mapping(mm, addr, vdso_size,
+        ret = install_special_mapping(mm, addr, size,
                                       VM_READ|VM_EXEC|
                                       VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
                                       VM_ALWAYSDUMP,
-                                      vdso_pages);
+                                      pages);
         if (ret) {
                 current->mm->context.vdso = NULL;
                 goto up_fail;
@@ -137,6 +185,20 @@ up_fail:
         return ret;
 }
 
+int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+{
+        return setup_additional_pages(bprm, uses_interp, vdso_pages,
+                                      vdso_size);
+}
+
+#ifdef CONFIG_X86_X32_ABI
+int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+{
+        return setup_additional_pages(bprm, uses_interp, vdsox32_pages,
+                                      vdsox32_size);
+}
+#endif
+
 static __init int vdso_setup(char *s)
 {
         vdso_enabled = simple_strtoul(s, NULL, 0);