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

In the case of POWERFAIL_NMI, remove the Giant acquisitions because they

Browse Source 
can lead to a deadlock if the thread owning the Giant lock is interrupted
by the NMI.
Instead, tollerate a small race on the x86 architecture.
This commit is contained in:
attilio 2008-08-13 18:29:29 +00:00
parent ff459eb3cf
commit 9d7147e670
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/i386/i386/trap.c
View File

@ -454,13 +454,11 @@ trap(struct trapframe *frame)
#ifndef TIMER_FREQ
# define TIMER_FREQ 1193182
#endif
mtx_lock(&Giant);
if (time_second - lastalert > 10) {
log(LOG_WARNING, "NMI: power fail\n");
sysbeep(880, hz);
lastalert = time_second;
}
mtx_unlock(&Giant);
goto userout;
#else /* !POWERFAIL_NMI */
/* machine/parity/power fail/"kitchen sink" faults */
@ -688,13 +686,11 @@ trap(struct trapframe *frame)
#ifdef DEV_ISA
case T_NMI:
#ifdef POWERFAIL_NMI
mtx_lock(&Giant);
if (time_second - lastalert > 10) {
log(LOG_WARNING, "NMI: power fail\n");
sysbeep(880, hz);
lastalert = time_second;
}
mtx_unlock(&Giant);
goto out;
#else /* !POWERFAIL_NMI */
/* XXX Giant */