diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index d11e1979f500..cfc2618d4f69 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -644,9 +644,7 @@ trap(frame)
 #endif /* DEV_ISA */
 		}
 
-		mtx_lock(&Giant);
 		trap_fatal(&frame, eva);
-		mtx_unlock(&Giant);
 		goto out;
 	}
 
@@ -889,9 +887,7 @@ trap_pfault(frame, usermode, eva)
 			frame->tf_eip = (int)PCPU_GET(curpcb)->pcb_onfault;
 			return (0);
 		}
-		mtx_lock(&Giant);
 		trap_fatal(frame, eva);
-		mtx_unlock(&Giant);
 		return (-1);
 	}
 
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index d11e1979f500..cfc2618d4f69 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -644,9 +644,7 @@ trap(frame)
 #endif /* DEV_ISA */
 		}
 
-		mtx_lock(&Giant);
 		trap_fatal(&frame, eva);
-		mtx_unlock(&Giant);
 		goto out;
 	}
 
@@ -889,9 +887,7 @@ trap_pfault(frame, usermode, eva)
 			frame->tf_eip = (int)PCPU_GET(curpcb)->pcb_onfault;
 			return (0);
 		}
-		mtx_lock(&Giant);
 		trap_fatal(frame, eva);
-		mtx_unlock(&Giant);
 		return (-1);
 	}
 
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index d11e1979f500..cfc2618d4f69 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -644,9 +644,7 @@ trap(frame)
 #endif /* DEV_ISA */
 		}
 
-		mtx_lock(&Giant);
 		trap_fatal(&frame, eva);
-		mtx_unlock(&Giant);
 		goto out;
 	}
 
@@ -889,9 +887,7 @@ trap_pfault(frame, usermode, eva)
 			frame->tf_eip = (int)PCPU_GET(curpcb)->pcb_onfault;
 			return (0);
 		}
-		mtx_lock(&Giant);
 		trap_fatal(frame, eva);
-		mtx_unlock(&Giant);
 		return (-1);
 	}