diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2020-07-22 20:15:21 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2020-07-22 20:15:21 +0000 |
| commit | ce53f590ca015b38ba58c35f023ae76360082fa6 (patch) | |
| tree | af31d1e4400334bfaa4a9a4741d02ec5cfffe879 /sys | |
| parent | fd7371f7e20010606e76ebd0fe9e609772ebbcf4 (diff) | |
| download | src-ce53f590ca015b38ba58c35f023ae76360082fa6.tar.gz src-ce53f590ca015b38ba58c35f023ae76360082fa6.zip | |
Untie nmi_handle_intr() from DEV_ISA.
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
Notes
Notes:
svn path=/head/; revision=363431
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/trap.c | 4 | ||||
| -rw-r--r-- | sys/i386/i386/trap.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 216cf15b0bf9..5ae1e7f3112b 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -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); diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index ccf16bf009cd..dd1ea0d1907e 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -407,7 +407,6 @@ user_trctrap_out: signo = SIGFPE; break; -#ifdef DEV_ISA case T_NMI: #ifdef POWERFAIL_NMI #ifndef TIMER_FREQ @@ -423,7 +422,6 @@ user_trctrap_out: 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 @@ kernel_trctrap: #endif break; -#ifdef DEV_ISA case T_NMI: #ifdef POWERFAIL_NMI if (time_second - lastalert > 10) { @@ -682,7 +679,6 @@ kernel_trctrap: nmi_handle_intr(type, frame); return; #endif /* POWERFAIL_NMI */ -#endif /* DEV_ISA */ } trap_fatal(frame, eva); |