svn commit: r363877 - in stable/12/sys: amd64/amd64 i386/i386

[Alexander Motin]

Author: mav
Date: Wed Aug  5 01:43:40 2020
New Revision: 363877
URL: https://svnweb.freebsd.org/changeset/base/363877

Log:
  MFC r363431: 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.

Modified:
  stable/12/sys/amd64/amd64/trap.c
  stable/12/sys/i386/i386/trap.c

Modified: stable/12/sys/amd64/amd64/trap.c
==============================================================================
--- stable/12/sys/amd64/amd64/trap.c	Tue Aug  4 23:30:10 2020	(r363876)
+++ stable/12/sys/amd64/amd64/trap.c	Wed Aug  5 01:43:40 2020	(r363877)
@@ -357,11 +357,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;
@@ -587,11 +585,9 @@ trap(struct trapframe *frame)
 #endif
 			break;
 
-#ifdef DEV_ISA
 		case T_NMI:
 			nmi_handle_intr(type, frame);
 			return;
-#endif
 		}
 
 		trap_fatal(frame, 0);

Modified: stable/12/sys/i386/i386/trap.c
==============================================================================
--- stable/12/sys/i386/i386/trap.c	Tue Aug  4 23:30:10 2020	(r363876)
+++ stable/12/sys/i386/i386/trap.c	Wed Aug  5 01:43:40 2020	(r363877)
@@ -413,7 +413,6 @@ user_trctrap_out:
 			signo = SIGFPE;
 			break;
 
-#ifdef DEV_ISA
 		case T_NMI:
 #ifdef POWERFAIL_NMI
 #ifndef TIMER_FREQ
@@ -429,7 +428,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;
@@ -675,7 +673,6 @@ kernel_trctrap:
 #endif
 			break;
 
-#ifdef DEV_ISA
 		case T_NMI:
 #ifdef POWERFAIL_NMI
 			if (time_second - lastalert > 10) {
@@ -688,7 +685,6 @@ kernel_trctrap:
 			nmi_handle_intr(type, frame);
 			return;
 #endif /* POWERFAIL_NMI */
-#endif /* DEV_ISA */
 		}
 
 		trap_fatal(frame, eva);