Index: sys/sparc64/sparc64/trap.c
===================================================================
--- sys/sparc64/sparc64/trap.c	(revisione 240240)
+++ sys/sparc64/sparc64/trap.c	(copia locale)
@@ -329,7 +329,6 @@ trap(struct trapframe *tf)
 		}
 
 		userret(td, tf);
-		mtx_assert(&Giant, MA_NOTOWNED);
 	} else {
 		KASSERT((tf->tf_type & T_KERNEL) != 0,
 		    ("trap: kernel trap isn't"));
Index: sys/ia64/ia32/ia32_trap.c
===================================================================
--- sys/ia64/ia32/ia32_trap.c	(revisione 240240)
+++ sys/ia64/ia32/ia32_trap.c	(copia locale)
@@ -278,6 +278,5 @@ ia32_trap(int vector, struct trapframe *tf)
 
 out:
 	userret(td, tf);
-	mtx_assert(&Giant, MA_NOTOWNED);
 	do_ast(tf);
 }
Index: sys/ia64/ia64/trap.c
===================================================================
--- sys/ia64/ia64/trap.c	(revisione 240240)
+++ sys/ia64/ia64/trap.c	(copia locale)
@@ -841,7 +841,6 @@ trap(int vector, struct trapframe *tf)
 out:
 	if (user) {
 		userret(td, tf);
-		mtx_assert(&Giant, MA_NOTOWNED);
 		do_ast(tf);
 	}
 	return;
Index: sys/i386/i386/trap.c
===================================================================
--- sys/i386/i386/trap.c	(revisione 240240)
+++ sys/i386/i386/trap.c	(copia locale)
@@ -775,7 +775,6 @@ trap(struct trapframe *frame)
 
 user:
 	userret(td, frame);
-	mtx_assert(&Giant, MA_NOTOWNED);
 	KASSERT(PCB_USER_FPU(td->td_pcb),
 	    ("Return from trap with kernel FPU ctx leaked"));
 userout:
Index: sys/amd64/amd64/trap.c
===================================================================
--- sys/amd64/amd64/trap.c	(revisione 240240)
+++ sys/amd64/amd64/trap.c	(copia locale)
@@ -632,7 +632,6 @@ trap(struct trapframe *frame)
 
 user:
 	userret(td, frame);
-	mtx_assert(&Giant, MA_NOTOWNED);
 	KASSERT(PCB_USER_FPU(td->td_pcb),
 	    ("Return from trap with kernel FPU ctx leaked"));
 userout:
Index: sys/powerpc/booke/trap.c
===================================================================
--- sys/powerpc/booke/trap.c	(revisione 240240)
+++ sys/powerpc/booke/trap.c	(copia locale)
@@ -249,7 +249,6 @@ trap(struct trapframe *frame)
 	}
 
 	userret(td, frame);
-	mtx_assert(&Giant, MA_NOTOWNED);
 }
 
 static void
Index: sys/powerpc/aim/trap.c
===================================================================
--- sys/powerpc/aim/trap.c	(revisione 240240)
+++ sys/powerpc/aim/trap.c	(copia locale)
@@ -297,7 +297,6 @@ trap(struct trapframe *frame)
 	}
 
 	userret(td, frame);
-	mtx_assert(&Giant, MA_NOTOWNED);
 }
 
 static void
Index: sys/kern/subr_trap.c
===================================================================
--- sys/kern/subr_trap.c	(revisione 240240)
+++ sys/kern/subr_trap.c	(copia locale)
@@ -260,7 +260,6 @@ ast(struct trapframe *framep)
 	}
 
 	userret(td, framep);
-	mtx_assert(&Giant, MA_NOTOWNED);
 }
 
 const char *
Index: sys/kern/kern_fork.c
===================================================================
--- sys/kern/kern_fork.c	(revisione 240240)
+++ sys/kern/kern_fork.c	(copia locale)
@@ -1055,5 +1055,4 @@ fork_return(struct thread *td, struct trapframe *f
 	if (KTRPOINT(td, KTR_SYSRET))
 		ktrsysret(SYS_fork, 0, 0);
 #endif
-	mtx_assert(&Giant, MA_NOTOWNED);
 }
Index: sys/mips/mips/trap.c
===================================================================
--- sys/mips/mips/trap.c	(revisione 240240)
+++ sys/mips/mips/trap.c	(copia locale)
@@ -1095,7 +1095,6 @@ out:
 	 * Note: we should only get here if returning to user mode.
 	 */
 	userret(td, trapframe);
-	mtx_assert(&Giant, MA_NOTOWNED);
 	return (trapframe->pc);
 }