From fd2b73153daa214ee917f2dc3e4d179acbd881d5 Mon Sep 17 00:00:00 2001 From: deraadt Date: Thu, 2 May 1996 13:14:51 +0000 Subject: [PATCH] proto more stuff --- sys/sys/disklabel.h | 5 +++-- sys/sys/proc.h | 7 +++++-- sys/sys/reboot.h | 16 ++++++++++++++-- sys/sys/signalvar.h | 9 +++++++-- sys/sys/systm.h | 11 +++++++++-- 5 files changed, 38 insertions(+), 10 deletions(-) diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index 6592c6ef059..fed79fb3794 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -1,5 +1,5 @@ -/* $OpenBSD: disklabel.h,v 1.6 1996/04/21 22:31:42 deraadt Exp $ */ -/* $NetBSD: disklabel.h,v 1.39 1996/04/09 20:55:26 cgd Exp $ */ +/* $OpenBSD: disklabel.h,v 1.7 1996/05/02 13:14:51 deraadt Exp $ */ +/* $NetBSD: disklabel.h,v 1.40 1996/04/22 01:23:13 christos Exp $ */ /* * Copyright (c) 1987, 1988, 1993 @@ -321,6 +321,7 @@ char *readdisklabel __P((dev_t, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *)); int writedisklabel __P((dev_t, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *)); +int bounds_check_with_label __P((struct buf *, struct disklabel *, int)); #endif #endif /* _LOCORE */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 3004e965ed2..c1673bfdd83 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1,5 +1,5 @@ -/* $OpenBSD: proc.h,v 1.6 1996/04/18 21:41:05 niklas Exp $ */ -/* $NetBSD: proc.h,v 1.43 1996/03/14 18:59:11 christos Exp $ */ +/* $OpenBSD: proc.h,v 1.7 1996/05/02 13:14:54 deraadt Exp $ */ +/* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */ /*- * Copyright (c) 1986, 1989, 1991, 1993 @@ -336,5 +336,8 @@ int fork1 __P((struct proc *, int, int, register_t *)); void kmeminit __P((void)); void rqinit __P((void)); int groupmember __P((gid_t, struct ucred *)); +void cpu_switch __P((struct proc *)); +void cpu_wait __P((struct proc *)); +void cpu_exit __P((struct proc *)); #endif /* _KERNEL */ #endif /* !_SYS_PROC_H_ */ diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h index 69c22a29a64..78284f4e093 100644 --- a/sys/sys/reboot.h +++ b/sys/sys/reboot.h @@ -1,5 +1,5 @@ -/* $OpenBSD: reboot.h,v 1.3 1996/04/18 21:41:07 niklas Exp $ */ -/* $NetBSD: reboot.h,v 1.8 1996/02/22 20:30:16 scottr Exp $ */ +/* $OpenBSD: reboot.h,v 1.4 1996/05/02 13:14:55 deraadt Exp $ */ +/* $NetBSD: reboot.h,v 1.9 1996/04/22 01:23:25 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1993, 1994 @@ -88,3 +88,15 @@ (((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \ ((controller) << B_CONTROLLERSHIFT) | ((unit) << B_UNITSHIFT) | \ ((partition) << B_PARTITIONSHIFT) | B_DEVMAGIC) + +#ifdef _KERNEL + +__BEGIN_DECLS + +void boot __P((int)) + __attribute__((__noreturn__)); + +__END_DECLS + +#endif /* _KERNEL */ + diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h index 9ef04702475..74e614bb71b 100644 --- a/sys/sys/signalvar.h +++ b/sys/sys/signalvar.h @@ -1,5 +1,5 @@ -/* $OpenBSD: signalvar.h,v 1.2 1996/03/03 12:12:19 niklas Exp $ */ -/* $NetBSD: signalvar.h,v 1.16 1996/02/09 18:25:34 christos Exp $ */ +/* $OpenBSD: signalvar.h,v 1.3 1996/05/02 13:14:58 deraadt Exp $ */ +/* $NetBSD: signalvar.h,v 1.17 1996/04/22 01:23:31 christos Exp $ */ /* * Copyright (c) 1991, 1993 @@ -169,5 +169,10 @@ int killpg1 __P((struct proc *, int, int, int)); * Machine-dependent functions: */ void sendsig __P((sig_t action, int sig, int returnmask, u_long code)); +struct core; +struct vnode; +struct ucred; +int cpu_coredump __P((struct proc *, struct vnode *, struct ucred *, + struct core *)); #endif /* _KERNEL */ #endif /* !_SYS_SIGNALVAR_H_ */ diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 4273c449f01..571f0f6983b 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -1,5 +1,5 @@ -/* $OpenBSD: systm.h,v 1.4 1996/04/21 22:32:04 deraadt Exp $ */ -/* $NetBSD: systm.h,v 1.48 1996/04/09 20:55:38 cgd Exp $ */ +/* $OpenBSD: systm.h,v 1.5 1996/05/02 13:14:59 deraadt Exp $ */ +/* $NetBSD: systm.h,v 1.49 1996/04/22 01:23:35 christos Exp $ */ /*- * Copyright (c) 1982, 1988, 1991, 1993 @@ -185,6 +185,7 @@ void statclock __P((struct clockframe *frame)); void initclocks __P((void)); void inittodr __P((time_t)); void resettodr __P((void)); +void cpu_initclocks __P((void)); void startprofclock __P((struct proc *)); void stopprofclock __P((struct proc *)); @@ -203,6 +204,12 @@ int uiomove __P((caddr_t, int, struct uio *)); int setjmp __P((label_t *)); void longjmp __P((label_t *)); +void consinit __P((void)); + +void cpu_startup __P((void)); +void cpu_set_kpc __P((struct proc *, void (*)(struct proc *))); + + #ifdef GPROF void kmstartup __P((void)); #endif -- 2.20.1