diff options
| author | jhb <jhb@FreeBSD.org> | 2016-01-27 17:55:01 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2016-01-27 17:55:01 +0000 |
| commit | 169dd4da8ec4b82f421e68b485d8db9cc7e8130a (patch) | |
| tree | 48ad17d8a902fe3a7db457f0f1c2e91606416caa /sys/mips | |
| parent | 5d125a19675da01292b0e7923072ecc5ab263f14 (diff) | |
| download | FreeBSD-src-169dd4da8ec4b82f421e68b485d8db9cc7e8130a.zip FreeBSD-src-169dd4da8ec4b82f421e68b485d8db9cc7e8130a.tar.gz | |
Convert ss_sp in stack_t and sigstack to void *.
POSIX requires these members to be of type void * rather than the
char * inherited from 4BSD. NetBSD and OpenBSD both changed their
fields to void * back in 1998. No new build failures were reported
via an exp-run.
PR: 206503 (exp-run)
Reviewed by: kib
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D5092
Diffstat (limited to 'sys/mips')
| -rw-r--r-- | sys/mips/mips/freebsd32_machdep.c | 2 | ||||
| -rw-r--r-- | sys/mips/mips/pm_machdep.c | 2 | ||||
| -rw-r--r-- | sys/mips/mips/vm_machdep.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/mips/mips/freebsd32_machdep.c b/sys/mips/mips/freebsd32_machdep.c index f4ace04..4ed58e21 100644 --- a/sys/mips/mips/freebsd32_machdep.c +++ b/sys/mips/mips/freebsd32_machdep.c @@ -410,7 +410,7 @@ freebsd32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Allocate and validate space for the signal handler context. */ if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe32 *)((vm_offset_t)(td->td_sigstk.ss_sp + + sfp = (struct sigframe32 *)(((uintptr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - sizeof(struct sigframe32)) & ~(sizeof(__int64_t) - 1)); } else diff --git a/sys/mips/mips/pm_machdep.c b/sys/mips/mips/pm_machdep.c index 9bccaec..2b02ba9 100644 --- a/sys/mips/mips/pm_machdep.c +++ b/sys/mips/mips/pm_machdep.c @@ -126,7 +126,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Allocate and validate space for the signal handler context. */ if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sfp = (struct sigframe *)((vm_offset_t)(td->td_sigstk.ss_sp + + sfp = (struct sigframe *)(((uintptr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size - sizeof(struct sigframe)) & ~(sizeof(__int64_t) - 1)); } else diff --git a/sys/mips/mips/vm_machdep.c b/sys/mips/mips/vm_machdep.c index 42f3f68..f952ecc 100644 --- a/sys/mips/mips/vm_machdep.c +++ b/sys/mips/mips/vm_machdep.c @@ -432,7 +432,7 @@ cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, * in ``See MIPS Run'' by D. Sweetman, p. 269 * align stack */ - sp = ((register_t)(intptr_t)(stack->ss_sp + stack->ss_size) & ~0x7) - + sp = (((intptr_t)stack->ss_sp + stack->ss_size) & ~0x7) - CALLFRAME_SIZ; /* |
