diff options
| author |   deraadt <deraadt@openbsd.org> | 1998-04-03 03:47:42 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1998-04-03 03:47:42 +0000 |
| commit | 9f71eb132b32086f80c98a8af927ba7f37503119 (patch) | |
| tree | f9f249e7773b19f19b955a61ee0d3fc085b2a4d0 | |
| parent | sync (diff) | |
| download | wireguard-openbsd-9f71eb132b32086f80c98a8af927ba7f37503119.tar.xz wireguard-openbsd-9f71eb132b32086f80c98a8af927ba7f37503119.zip | |
trapsignal cleanup
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/trap.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c index f27ccadb935..339f8513cf6 100644 --- a/sys/arch/mvme68k/mvme68k/trap.c +++ b/sys/arch/mvme68k/mvme68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.18 1997/04/08 13:55:57 briggs Exp $ */ +/* $OpenBSD: trap.c,v 1.19 1998/04/03 03:47:42 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -235,10 +235,12 @@ again: p->p_pid, p->p_comm, fp->f_pc, faultaddr); #endif } else if (sig = writeback(fp, fromtrap)) { + register union sigval sv; + beenhere = 1; oticks = p->p_sticks; - trapsignal(p, sig, VM_PROT_WRITE, SEGV_MAPERR, - (caddr_t)faultaddr); + sv.sival_int = faultaddr; + trapsignal(p, sig, VM_PROT_WRITE, SEGV_MAPERR, sv); goto again; } } @@ -270,6 +272,7 @@ trap(type, code, v, frame) #ifdef COMPAT_SUNOS extern struct emul emul_sunos; #endif + register union sigval sv; cnt.v_trap++; p = curproc; @@ -644,7 +647,8 @@ copyfault: break; } } - trapsignal(p, i, ucode, typ, (caddr_t)v); + sv.sival_int = v; + trapsignal(p, i, ucode, typ, sv); if ((type & T_USER) == 0) return; out: |