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/arm64 | |
| 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/arm64')
| -rw-r--r-- | sys/arm64/arm64/machdep.c | 2 | ||||
| -rw-r--r-- | sys/arm64/arm64/vm_machdep.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 0e61817b..409ecd3 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -527,7 +527,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 && !onstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - fp = (struct sigframe *)(td->td_sigstk.ss_sp + + fp = (struct sigframe *)((uintptr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size); #if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; diff --git a/sys/arm64/arm64/vm_machdep.c b/sys/arm64/arm64/vm_machdep.c index edcdeca..6794b1b4 100644 --- a/sys/arm64/arm64/vm_machdep.c +++ b/sys/arm64/arm64/vm_machdep.c @@ -186,7 +186,7 @@ cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg, { struct trapframe *tf = td->td_frame; - tf->tf_sp = STACKALIGN(stack->ss_sp + stack->ss_size); + tf->tf_sp = STACKALIGN((uintptr_t)stack->ss_sp + stack->ss_size); tf->tf_elr = (register_t)entry; tf->tf_x[0] = (register_t)arg; } |
