leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

signal: Remove unnecessary ifdefs now that there is only one struct siginfo

Browse Source 
Remove HAVE_ARCH_SIGINFO_T
Remove __ARCH_SIGSYS

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2017-07-27 11:59:46 -05:00
parent 09d1415d24
commit 0326e7ef05
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/signal.h
View File

@ -30,9 +30,7 @@ enum siginfo_layout {
SIL_FAULT, SIL_FAULT,
SIL_CHLD, SIL_CHLD,
SIL_RT, SIL_RT,
#ifdef __ARCH_SIGSYS
SIL_SYS, SIL_SYS,
#endif
}; };
enum siginfo_layout siginfo_layout(int sig, int si_code); enum siginfo_layout siginfo_layout(int sig, int si_code);

8
include/uapi/asm-generic/siginfo.h
View File

@ -44,8 +44,6 @@ typedef union sigval {
#define __ARCH_SI_ATTRIBUTES #define __ARCH_SI_ATTRIBUTES
#endif #endif
#ifndef HAVE_ARCH_SIGINFO_T
typedef struct siginfo { typedef struct siginfo {
int si_signo; int si_signo;
#ifndef __ARCH_HAS_SWAPPED_SIGINFO #ifndef __ARCH_HAS_SWAPPED_SIGINFO
@ -128,10 +126,6 @@ typedef struct siginfo {
} _sifields; } _sifields;
} __ARCH_SI_ATTRIBUTES siginfo_t; } __ARCH_SI_ATTRIBUTES siginfo_t;
/* If the arch shares siginfo, then it has SIGSYS. */
#define __ARCH_SIGSYS
#endif
/* /*
* How these fields are to be accessed. * How these fields are to be accessed.
*/ */
@ -156,11 +150,9 @@ typedef struct siginfo {
#define si_pkey _sifields._sigfault._pkey #define si_pkey _sifields._sigfault._pkey
#define si_band _sifields._sigpoll._band #define si_band _sifields._sigpoll._band
#define si_fd _sifields._sigpoll._fd #define si_fd _sifields._sigpoll._fd
#ifdef __ARCH_SIGSYS
#define si_call_addr _sifields._sigsys._call_addr #define si_call_addr _sifields._sigsys._call_addr
#define si_syscall _sifields._sigsys._syscall #define si_syscall _sifields._sigsys._syscall
#define si_arch _sifields._sigsys._arch #define si_arch _sifields._sigsys._arch
#endif
/* /*
* si_code values * si_code values

4
kernel/signal.c
View File

@ -2697,9 +2697,7 @@ enum siginfo_layout siginfo_layout(int sig, int si_code)
#endif #endif
[SIGCHLD] = { NSIGCHLD, SIL_CHLD }, [SIGCHLD] = { NSIGCHLD, SIL_CHLD },
[SIGPOLL] = { NSIGPOLL, SIL_POLL }, [SIGPOLL] = { NSIGPOLL, SIL_POLL },
#ifdef __ARCH_SIGSYS
[SIGSYS] = { NSIGSYS, SIL_SYS }, [SIGSYS] = { NSIGSYS, SIL_SYS },
#endif
}; };
if ((sig < ARRAY_SIZE(filter)) && (si_code <= filter[sig].limit)) if ((sig < ARRAY_SIZE(filter)) && (si_code <= filter[sig].limit))
layout = filter[sig].layout; layout = filter[sig].layout;
@ -2804,13 +2802,11 @@ int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from)
err |= __put_user(from->si_uid, &to->si_uid); err |= __put_user(from->si_uid, &to->si_uid);
err |= __put_user(from->si_ptr, &to->si_ptr); err |= __put_user(from->si_ptr, &to->si_ptr);
break; break;
#ifdef __ARCH_SIGSYS
case SIL_SYS: case SIL_SYS:
err |= __put_user(from->si_call_addr, &to->si_call_addr); err |= __put_user(from->si_call_addr, &to->si_call_addr);
err |= __put_user(from->si_syscall, &to->si_syscall); err |= __put_user(from->si_syscall, &to->si_syscall);
err |= __put_user(from->si_arch, &to->si_arch); err |= __put_user(from->si_arch, &to->si_arch);
break; break;
#endif
} }
return err; return err;
} }