d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert previous revision which was accidentally committed and has not been

Browse Source 
tested yet.
This commit is contained in:
jhb 2002-08-01 13:39:33 +00:00
parent 8e3b69b892
commit 8001b81e02
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/kern_shutdown.c
View File

@ -420,7 +420,7 @@ shutdown_reset(void *junk, int howto)
}
#ifdef SMP
static uintptr_t panic_thread = NULL;
static u_int panic_cpu = NOCPU;
#endif
/*
@ -441,17 +441,15 @@ panic(const char *fmt, ...)
#ifdef SMP
/*
* We don't want multiple CPU's to panic at the same time, so we
* use panic_thread as a simple spinlock. We have to keep checking
* panic_thread if we are spinning in case the panic on the first
* use panic_cpu as a simple spinlock. We have to keep checking
* panic_cpu if we are spinning in case the panic on the first
* CPU is canceled.
*/
if (panic_thread != curthread)
while (atomic_cmpset_ptr(&panic_thread, NULL, curthread) == 0)
while (panic_thread != NULL) {
#ifdef __i386__
ia32_pause();
#endif
}
if (panic_cpu != PCPU_GET(cpuid))
while (atomic_cmpset_int(&panic_cpu, NOCPU,
PCPU_GET(cpuid)) == 0)
while (panic_cpu != NOCPU)
; /* nothing */
#endif
bootopt = RB_AUTOBOOT | RB_DUMP;
@ -483,7 +481,7 @@ panic(const char *fmt, ...)
/* See if the user aborted the panic, in which case we continue. */
if (panicstr == NULL) {
#ifdef SMP
atomic_store_rel_ptr(&panic_thread, NULL);
atomic_store_rel_int(&panic_cpu, NOCPU);
#endif
return;
}