system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-03 15:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Untie nmi_handle_intr() from DEV_ISA.

Browse source 
The only part of nmi_handle_intr() depending on ISA is isa_nmi(), which is
already wrapped.  Entering debugger on NMI does not really depend on ISA.

MFC after:	2 weeks
This commit is contained in:
Alexander Motin 2020-07-22 20:15:21 +00:00
parent fd7371f7e2
commit ce53f590ca
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=363431
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/amd64/amd64/trap.c
View file

@ -350,11 +350,9 @@ trap(struct trapframe *frame)
signo = SIGFPE;
break;
#ifdef DEV_ISA
case T_NMI:
nmi_handle_intr(type, frame);
return;
#endif
case T_OFLOW: /* integer overflow fault */
ucode = FPE_INTOVF;
@ -580,11 +578,9 @@ trap(struct trapframe *frame)
#endif
break;
#ifdef DEV_ISA
case T_NMI:
nmi_handle_intr(type, frame);
return;
#endif
}
trap_fatal(frame, 0);

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

@ -407,7 +407,6 @@ trap(struct trapframe *frame)
signo = SIGFPE;
break;
#ifdef DEV_ISA
case T_NMI:
#ifdef POWERFAIL_NMI
#ifndef TIMER_FREQ
@ -423,7 +422,6 @@ trap(struct trapframe *frame)
nmi_handle_intr(type, frame);
return;
#endif /* POWERFAIL_NMI */
#endif /* DEV_ISA */
case T_OFLOW: /* integer overflow fault */
ucode = FPE_INTOVF;
@ -669,7 +667,6 @@ trap(struct trapframe *frame)
#endif
break;
#ifdef DEV_ISA
case T_NMI:
#ifdef POWERFAIL_NMI
if (time_second - lastalert > 10) {
@ -682,7 +679,6 @@ trap(struct trapframe *frame)
nmi_handle_intr(type, frame);
return;
#endif /* POWERFAIL_NMI */
#endif /* DEV_ISA */
}
trap_fatal(frame, eva);