signal: Remove unnecessary ifdefs now that there is only one struct siginfo
Remove HAVE_ARCH_SIGINFO_T Remove __ARCH_SIGSYS Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
parent
09d1415d24
commit
0326e7ef05
|
@ -30,9 +30,7 @@ enum siginfo_layout {
|
|||
SIL_FAULT,
|
||||
SIL_CHLD,
|
||||
SIL_RT,
|
||||
#ifdef __ARCH_SIGSYS
|
||||
SIL_SYS,
|
||||
#endif
|
||||
};
|
||||
|
||||
enum siginfo_layout siginfo_layout(int sig, int si_code);
|
||||
|
|
|
@ -44,8 +44,6 @@ typedef union sigval {
|
|||
#define __ARCH_SI_ATTRIBUTES
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_ARCH_SIGINFO_T
|
||||
|
||||
typedef struct siginfo {
|
||||
int si_signo;
|
||||
#ifndef __ARCH_HAS_SWAPPED_SIGINFO
|
||||
|
@ -128,10 +126,6 @@ typedef struct siginfo {
|
|||
} _sifields;
|
||||
} __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.
|
||||
*/
|
||||
|
@ -156,11 +150,9 @@ typedef struct siginfo {
|
|||
#define si_pkey _sifields._sigfault._pkey
|
||||
#define si_band _sifields._sigpoll._band
|
||||
#define si_fd _sifields._sigpoll._fd
|
||||
#ifdef __ARCH_SIGSYS
|
||||
#define si_call_addr _sifields._sigsys._call_addr
|
||||
#define si_syscall _sifields._sigsys._syscall
|
||||
#define si_arch _sifields._sigsys._arch
|
||||
#endif
|
||||
|
||||
/*
|
||||
* si_code values
|
||||
|
|
|
@ -2697,9 +2697,7 @@ enum siginfo_layout siginfo_layout(int sig, int si_code)
|
|||
#endif
|
||||
[SIGCHLD] = { NSIGCHLD, SIL_CHLD },
|
||||
[SIGPOLL] = { NSIGPOLL, SIL_POLL },
|
||||
#ifdef __ARCH_SIGSYS
|
||||
[SIGSYS] = { NSIGSYS, SIL_SYS },
|
||||
#endif
|
||||
};
|
||||
if ((sig < ARRAY_SIZE(filter)) && (si_code <= filter[sig].limit))
|
||||
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_ptr, &to->si_ptr);
|
||||
break;
|
||||
#ifdef __ARCH_SIGSYS
|
||||
case SIL_SYS:
|
||||
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_arch, &to->si_arch);
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue