diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-03-07 12:41:35 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-03-07 12:41:35 +0000 |
| commit | 1f86b89d76b8be52ff0ca23a3cf007c38acc2318 (patch) | |
| tree | 65e3accc2625ccb53c1d47431587232fdc41cdab /sys/arch | |
| parent | 15478b45f51a31fbd084cb05d6daef4d8dd38ab5 (diff) | |
please the anal compiler
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/hp300/hp300/pmap_bootstrap.c | 5 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/trap.c | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/arch/hp300/hp300/pmap_bootstrap.c b/sys/arch/hp300/hp300/pmap_bootstrap.c index e737235de73..26227b80ae9 100644 --- a/sys/arch/hp300/hp300/pmap_bootstrap.c +++ b/sys/arch/hp300/hp300/pmap_bootstrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_bootstrap.c,v 1.5 1997/07/06 08:02:08 downsj Exp $ */ +/* $OpenBSD: pmap_bootstrap.c,v 1.6 1998/03/07 12:41:33 deraadt Exp $ */ /* $NetBSD: pmap_bootstrap.c,v 1.13 1997/06/10 18:56:50 veego Exp $ */ /* @@ -448,11 +448,12 @@ pmap_bootstrap(nextpa, firstpa) /* * Determine VA aliasing distance if any */ - if (RELOC(ectype, int) == EC_VIRT) + if (RELOC(ectype, int) == EC_VIRT) { if (RELOC(machineid, int) == HP_320) RELOC(pmap_aliasmask, int) = 0x3fff; /* 16k */ else if (RELOC(machineid, int) == HP_350) RELOC(pmap_aliasmask, int) = 0x7fff; /* 32k */ + } #endif /* diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c index fb5798daefb..9052d1880c0 100644 --- a/sys/arch/hp300/hp300/trap.c +++ b/sys/arch/hp300/hp300/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.12 1997/07/13 09:48:01 downsj Exp $ */ +/* $OpenBSD: trap.c,v 1.13 1998/03/07 12:41:34 deraadt Exp $ */ /* $NetBSD: trap.c,v 1.55 1997/07/08 16:56:36 kleink Exp $ */ /* @@ -214,6 +214,7 @@ userret(p, fp, oticks, faultaddr, fromtrap) int fromtrap; { int sig, s; + union sigval sv; #ifdef M68040 int beenhere = 0; @@ -271,8 +272,8 @@ again: } else if ((sig = writeback(fp, fromtrap))) { beenhere = 1; oticks = p->p_sticks; - trapsignal(p, sig, T_MMUFLT, SEGV_MAPERR, - (caddr_t)faultaddr); + sv.sival_ptr = (caddr_t)faultaddr; + trapsignal(p, sig, T_MMUFLT, SEGV_MAPERR, sv); goto again; } } @@ -299,6 +300,7 @@ trap(type, code, v, frame) u_int ucode; u_quad_t sticks = 0 /* XXX initializer works around compiler bug */; int typ = 0; + union sigval sv; cnt.v_trap++; p = curproc; @@ -714,7 +716,8 @@ trap(type, code, v, frame) break; } } - trapsignal(p, i, ucode, typ, (caddr_t)v); + sv.sival_ptr = (caddr_t)v; + trapsignal(p, i, ucode, typ, sv); if ((type & T_USER) == 0) return; out: |