summaryrefslogtreecommitdiff
path: root/sys/arch/amiga
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-05-28 09:45:12 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-05-28 09:45:12 +0000
commitd5293b36c40367564df7165023572799c6cbfc08 (patch)
treea1eef6d121511cfdcba0b7b7b992a87cdb9039a5 /sys/arch/amiga
parentefa71255469069820d4122d56c560d0182d0e184 (diff)
Implement bootsync() again, and let boot() call it
Diffstat (limited to 'sys/arch/amiga')
-rw-r--r--sys/arch/amiga/amiga/machdep.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 4d0c1b3a0f3..ccac1292092 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.11 1996/05/09 21:13:37 niklas Exp $ */
+/* $OpenBSD: machdep.c,v 1.12 1996/05/28 09:45:11 niklas Exp $ */
/* $NetBSD: machdep.c,v 1.65 1996/05/01 09:56:22 veego Exp $ */
/*
@@ -959,15 +959,9 @@ sys_sigreturn(p, v, retval)
static int waittime = -1;
void
-boot(howto)
- register int howto;
+bootsync(void)
{
- /* take a snap shot before clobbering any registers */
- if (curproc)
- savectx(&curproc->p_addr->u_pcb);
-
- boothowto = howto;
- if ((howto & RB_NOSYNC) == 0 && waittime < 0) {
+ if (waittime < 0) {
waittime = 0;
vfs_shutdown();
/*
@@ -976,6 +970,19 @@ boot(howto)
*/
resettodr();
}
+}
+
+void
+boot(howto)
+ register int howto;
+{
+ /* take a snap shot before clobbering any registers */
+ if (curproc)
+ savectx(&curproc->p_addr->u_pcb);
+
+ boothowto = howto;
+ if ((howto & RB_NOSYNC) == 0)
+ bootsync();
/* Disable interrupts. */
spl7();