3 files changed, 19 insertions, 4 deletions

diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 25d80f3faf2e..bc09ed2a8b97 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -37,6 +37,7 @@
 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;
@@ -66,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/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
index c6435ab1cc13..7d0c18587709 100644
--- a/arch/x86/include/asm/ia32.h
+++ b/arch/x86/include/asm/ia32.h
@@ -125,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/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl
index 4aecc7e31166..0d778b800884 100644
--- a/arch/x86/syscalls/syscall_64.tbl
+++ b/arch/x86/syscalls/syscall_64.tbl
@@ -106,7 +106,7 @@
 97      common  getrlimit               sys_getrlimit
 98      common  getrusage               sys_getrusage
 99      common  sysinfo                 sys_sysinfo
-100     64      times                   sys_times
+100     common  times                   sys_times
 101     common  ptrace                  sys_ptrace
 102     common  getuid                  sys_getuid
 103     common  syslog                  sys_syslog
@@ -331,7 +331,7 @@
 518     x32     sendmsg                 compat_sys_sendmsg
 519     x32     recvmsg                 compat_sys_recvmsg
 520     x32     execve                  stub_x32_execve
-521     x32     times                   compat_sys_times
+# 521 available
 522     x32     rt_sigpending           sys32_rt_sigpending
 523     x32     rt_sigtimedwait         compat_sys_rt_sigtimedwait
 524     x32     rt_sigqueueinfo         sys32_rt_sigqueueinfo