summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64
diff options
context:
space:
mode:
authorMasao Uebayashi <uebayasi@cvs.openbsd.org>2014-07-11 22:28:07 +0000
committerMasao Uebayashi <uebayasi@cvs.openbsd.org>2014-07-11 22:28:07 +0000
commite135a1a144961c66ddc491f160b768094f3ee23e (patch)
tree4c0a2ba3599d4c9340c8038e060791bad9ed4e06 /sys/arch/sparc64
parent59e0a38e2425017e3db4dd76b453574687eecbb8 (diff)
boot(9): Undo curproc-overriding hacks
Some (not all) boot(9) implementations have ancient hacks which overrides if (curproc == NULL). This was probably made in a hope to forcibly proceed various clean-shutdown related code, including VFS shutdown. Let's clarify that clean-shutdown needs process context; it is impossible to cleanly shutdown VFS from within e.g. a panic in SPL_HIGH. OK kettenis@
Diffstat (limited to 'sys/arch/sparc64')
-rw-r--r--sys/arch/sparc64/sparc64/machdep.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index c78acf20e6e..e6a9c12142d 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.162 2014/07/11 09:36:26 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.163 2014/07/11 22:28:06 uebayasi Exp $ */
/* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
/*-
@@ -620,12 +620,8 @@ boot(int howto)
fb_unblank();
boothowto = howto;
if ((howto & RB_NOSYNC) == 0 && waittime < 0) {
- extern struct proc proc0;
extern int sparc_clock_time_is_ok;
- /* make sure there's a process to charge for I/O in sync() */
- if (curproc == NULL)
- curproc = &proc0;
waittime = 0;
vfs_shutdown();