summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_shutdown.c
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-01-08 22:52:02 +0000
committerimp <imp@FreeBSD.org>2010-01-08 22:52:02 +0000
commitf7c48f09b3d4c0da2ad204821e9b5f64537e9fb8 (patch)
treeb90b1a51431b5debb8652ce24d66293832472719 /sys/kern/kern_shutdown.c
parent382bd114d47d27897b6d0fe901f339d755ab880e (diff)
downloadFreeBSD-src-f7c48f09b3d4c0da2ad204821e9b5f64537e9fb8.zip
FreeBSD-src-f7c48f09b3d4c0da2ad204821e9b5f64537e9fb8.tar.gz
Revert r199758. It pointed out that we were calling pcpu_init way too
late...
Diffstat (limited to 'sys/kern/kern_shutdown.c')
-rw-r--r--sys/kern/kern_shutdown.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 5e192b9..3d96321 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -516,8 +516,7 @@ panic(const char *fmt, ...)
va_list ap;
static char buf[256];
- if (td)
- critical_enter();
+ critical_enter();
#ifdef SMP
/*
* We don't want multiple CPU's to panic at the same time, so we
@@ -576,8 +575,7 @@ panic(const char *fmt, ...)
/* thread_unlock(td); */
if (!sync_on_panic)
bootopt |= RB_NOSYNC;
- if (td)
- critical_exit();
+ critical_exit();
boot(bootopt);
}
OpenPOWER on IntegriCloud