diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-16 11:56:40 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-16 11:56:40 +0000 |
| commit | ab08be91e5dc66cfc42b85763d4caf94e2fd3d09 (patch) | |
| tree | 89caace66e8787764cc54b781a8cbfd881b69458 /sys/arch/hp300/include/hpux_machdep.h | |
| parent | 75113d46e0ad67778c0741a5bfc96d9d686f7eec (diff) | |
Merge portions of NetBSD up to 970415.
This includes:
* All of the prototyping and KNF changes.
* The new interrupt system.
* Portions of the Domain Keyboard support from Mike Smith.
This does not include:
* m68k changes, namely generic dumps.
Various sundry changes and fixes by me.
Diffstat (limited to 'sys/arch/hp300/include/hpux_machdep.h')
| -rw-r--r-- | sys/arch/hp300/include/hpux_machdep.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/arch/hp300/include/hpux_machdep.h b/sys/arch/hp300/include/hpux_machdep.h index 7c6f14f1e9e..337986aa9fb 100644 --- a/sys/arch/hp300/include/hpux_machdep.h +++ b/sys/arch/hp300/include/hpux_machdep.h @@ -1,5 +1,5 @@ -/* $OpenBSD: hpux_machdep.h,v 1.4 1997/03/26 08:32:46 downsj Exp $ */ -/* $NetBSD: hpux_machdep.h,v 1.6 1997/03/16 10:02:40 thorpej Exp $ */ +/* $OpenBSD: hpux_machdep.h,v 1.5 1997/04/16 11:56:34 downsj Exp $ */ +/* $NetBSD: hpux_machdep.h,v 1.7 1997/04/01 20:05:14 scottr Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -66,6 +66,10 @@ struct hpuxsigcontext { int _hsc_ap; /* pointer to hpuxsigstate */ }; +#ifdef _KERNEL +struct exec_package; +struct exec_vmcmd; + int hpux_cpu_makecmds __P((struct proc *, struct exec_package *)); int hpux_cpu_vmcmd __P((struct proc *, struct exec_vmcmd *)); void hpux_cpu_bsd_to_hpux_stat __P((struct stat *, struct hpux_stat *)); @@ -76,5 +80,6 @@ int hpux_to_bsd_uoff __P((int *, int *, struct proc *)); void hpux_sendsig __P((sig_t, int, int, u_long, int, union sigval)); void hpux_setregs __P((struct proc *, struct exec_package *, u_long, register_t *)); +#endif /* _KERNEL */ #endif /* ! _MACHINE_HPUX_MACHDEP_H_ */ |