diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-13 09:48:03 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-13 09:48:03 +0000 |
| commit | ea02c5005fcf76b2b6e8b3c847d6134492640cea (patch) | |
| tree | 05b7c2cbf2f35dfc5aed288c30e30bd75e317dfe /sys | |
| parent | 20499871c866979e94a6ed88a9701f5d9feb419f (diff) | |
sync to NETBSD_CURRENT_970711.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hp300/dev/hd.c | 9 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/sd.c | 9 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/trap.c | 17 | ||||
| -rw-r--r-- | sys/arch/hp300/include/param.h | 8 |
4 files changed, 19 insertions, 24 deletions
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c index 586e421a7ae..2bf87145182 100644 --- a/sys/arch/hp300/dev/hd.c +++ b/sys/arch/hp300/dev/hd.c @@ -1,5 +1,5 @@ -/* $OpenBSD: hd.c,v 1.5 1997/07/06 08:01:52 downsj Exp $ */ -/* $NetBSD: rd.c,v 1.32 1997/06/24 00:44:03 thorpej Exp $ */ +/* $OpenBSD: hd.c,v 1.6 1997/07/13 09:47:59 downsj Exp $ */ +/* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */ /* * Copyright (c) 1996, 1997 Jason R. Thorpe. All rights reserved. @@ -65,11 +65,6 @@ #include <hp300/dev/hdreg.h> #include <hp300/dev/hdvar.h> -#include <vm/vm_param.h> -#include <vm/lock.h> -#include <vm/vm_prot.h> -#include <vm/pmap.h> - #include "opt_useleds.h" #ifdef USELEDS diff --git a/sys/arch/hp300/dev/sd.c b/sys/arch/hp300/dev/sd.c index e9bd3e8119a..f168510a78c 100644 --- a/sys/arch/hp300/dev/sd.c +++ b/sys/arch/hp300/dev/sd.c @@ -1,5 +1,5 @@ -/* $OpenBSD: sd.c,v 1.11 1997/07/06 08:01:56 downsj Exp $ */ -/* $NetBSD: sd.c,v 1.33 1997/06/24 00:44:05 thorpej Exp $ */ +/* $OpenBSD: sd.c,v 1.12 1997/07/13 09:48:00 downsj Exp $ */ +/* $NetBSD: sd.c,v 1.34 1997/07/10 18:14:10 kleink Exp $ */ /* * Copyright (c) 1996, 1997 Jason R. Thorpe. All rights reserved. @@ -60,11 +60,6 @@ #include <hp300/dev/scsivar.h> #include <hp300/dev/sdvar.h> -#include <vm/vm_param.h> -#include <vm/lock.h> -#include <vm/vm_prot.h> -#include <vm/pmap.h> - #include "opt_useleds.h" #ifdef USELEDS diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c index 21e7f6fb531..fb5798daefb 100644 --- a/sys/arch/hp300/hp300/trap.c +++ b/sys/arch/hp300/hp300/trap.c @@ -1,5 +1,5 @@ -/* $OpenBSD: trap.c,v 1.11 1997/07/06 08:02:09 downsj Exp $ */ -/* $NetBSD: trap.c,v 1.54 1997/05/19 10:15:01 veego Exp $ */ +/* $OpenBSD: trap.c,v 1.12 1997/07/13 09:48:01 downsj Exp $ */ +/* $NetBSD: trap.c,v 1.55 1997/07/08 16:56:36 kleink Exp $ */ /* * Copyright (c) 1997 Theo de Raadt @@ -540,13 +540,14 @@ trap(type, code, v, frame) case T_TRAP15|T_USER: /* SUN user trace trap */ #ifdef COMPAT_SUNOS /* - * XXX This comment/code is not consistent XXX - * SunOS seems to use Trap #2 for some obscure - * fpu operations. So far, just ignore it, but - * DONT trap on it.. + * SunOS uses Trap #2 for a "CPU cache flush". + * Just flush the on-chip caches and return. */ - if (p->p_emul == &emul_sunos) - goto out; + if (p->p_emul == &emul_sunos) { + ICIA(); + DCIU(); + return; + } #endif frame.f_sr &= ~PSL_T; i = SIGTRAP; diff --git a/sys/arch/hp300/include/param.h b/sys/arch/hp300/include/param.h index a3c8014b130..a81227f6093 100644 --- a/sys/arch/hp300/include/param.h +++ b/sys/arch/hp300/include/param.h @@ -1,5 +1,5 @@ -/* $OpenBSD: param.h,v 1.8 1997/07/06 08:02:13 downsj Exp $ */ -/* $NetBSD: param.h,v 1.34 1997/06/10 18:59:12 veego Exp $ */ +/* $OpenBSD: param.h,v 1.9 1997/07/13 09:48:02 downsj Exp $ */ +/* $NetBSD: param.h,v 1.35 1997/07/10 08:22:38 veego Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -64,8 +64,12 @@ #define NBSEG (1 << SEGSHIFT) /* bytes/segment */ #define SEGOFSET (NBSEG-1) /* byte offset into segment */ +#define UPAGES 2 /* pages of u-area */ + #include <m68k/param.h> +#define NPTEPG (NBPG/(sizeof (pt_entry_t))) + /* * Size of kernel malloc arena in CLBYTES-sized logical pages */ |