diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2001-06-05 23:07:51 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2001-06-05 23:07:51 +0000 |
| commit | 98942c79ed22fe4499b73737f7e8f65658c376b8 (patch) | |
| tree | d167c70ce7f12565412509f331b8266fdc37b2b6 /sys/arch | |
| parent | 074729d13ec1462d4412b672f55b296c13a53c70 (diff) | |
Call doshutdownhooks() in boot(). Cleanup code path a little.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/machdep.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index 96c66f18b0d..1ff9de1ff0c 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.36 2001/05/20 05:53:10 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.37 2001/06/05 23:07:50 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -1259,18 +1259,23 @@ boot(howto) */ resettodr(); } - splhigh(); /* extreme priority */ + + /* Disable interrupts. */ + splhigh(); + if (howto & RB_HALT) { printf("halted\n\n"); - bugreturn(); } else { + /* If rebooting and a dump is requested, do it. */ if (howto & RB_DUMP) dumpsys(); - doboot(); - /*NOTREACHED*/ + + /* Run any shutdown hooks. */ + doshutdownhooks(); } + doboot(); /*NOTREACHED*/ - while (1); /* to keep compiler happy, and me from going crazy */ + for (;;); /* to keep compiler happy, and me from going crazy */ } #ifdef MVME188 |