signal: Remove kernel interal si_code magic

[sfrench/cifs-2.6.git] / arch / x86 / kernel / signal_compat.c

diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c
index 71beb28600d4531d93a9966401a1ca082a9f0c2e..ab9feb5887b149ee8cc284045ca96d97c8eb4e78 100644 (file)
--- a/arch/x86/kernel/signal_compat.c
+++ b/arch/x86/kernel/signal_compat.c
@@ -129,7 +129,7 @@ int __copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from,
                   3 ints plus the relevant union member.  */
                put_user_ex(from->si_signo, &to->si_signo);
                put_user_ex(from->si_errno, &to->si_errno);
-               put_user_ex((short)from->si_code, &to->si_code);
+               put_user_ex(from->si_code, &to->si_code);
 
                if (from->si_code < 0) {
                        put_user_ex(from->si_pid, &to->si_pid);
@@ -142,8 +142,8 @@ int __copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from,
                         */
                        put_user_ex(from->_sifields._pad[0],
                                          &to->_sifields._pad[0]);
-                       switch (from->si_code >> 16) {
-                       case __SI_FAULT >> 16:
+                       switch (siginfo_layout(from->si_signo, from->si_code)) {
+                       case SIL_FAULT:
                                if (from->si_signo == SIGBUS &&
                                    (from->si_code == BUS_MCEERR_AR ||
                                     from->si_code == BUS_MCEERR_AO))
@@ -160,11 +160,11 @@ int __copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from,
                                                put_user_ex(from->si_pkey, &to->si_pkey);
                                }
                                break;
-                       case __SI_SYS >> 16:
+                       case SIL_SYS:
                                put_user_ex(from->si_syscall, &to->si_syscall);
                                put_user_ex(from->si_arch, &to->si_arch);
                                break;
-                       case __SI_CHLD >> 16:
+                       case SIL_CHLD:
                                if (!x32_ABI) {
                                        put_user_ex(from->si_utime, &to->si_utime);
                                        put_user_ex(from->si_stime, &to->si_stime);
@@ -174,21 +174,18 @@ int __copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from,
                                }
                                put_user_ex(from->si_status, &to->si_status);
                                /* FALL THROUGH */
-                       default:
-                       case __SI_KILL >> 16:
+                       case SIL_KILL:
                                put_user_ex(from->si_uid, &to->si_uid);
                                break;
-                       case __SI_POLL >> 16:
+                       case SIL_POLL:
                                put_user_ex(from->si_fd, &to->si_fd);
                                break;
-                       case __SI_TIMER >> 16:
+                       case SIL_TIMER:
                                put_user_ex(from->si_overrun, &to->si_overrun);
                                put_user_ex(ptr_to_compat(from->si_ptr),
                                            &to->si_ptr);
                                break;
-                                /* This is not generated by the kernel as of now.  */
-                       case __SI_RT >> 16:
-                       case __SI_MESGQ >> 16:
+                       case SIL_RT:
                                put_user_ex(from->si_uid, &to->si_uid);
                                put_user_ex(from->si_int, &to->si_int);
                                break;