summaryrefslogtreecommitdiffstats
path: root/sys/ia64
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2012-09-08 18:27:11 +0000
committerattilio <attilio@FreeBSD.org>2012-09-08 18:27:11 +0000
commit8dece93b14588b73bf5dec69091706dcdccba2fc (patch)
tree52124b3834c9171d7973cf98f0dd6c90bfdfdc9b /sys/ia64
parentc069e61b00c591709456d152a3b719e87ac7e570 (diff)
downloadFreeBSD-src-8dece93b14588b73bf5dec69091706dcdccba2fc.zip
FreeBSD-src-8dece93b14588b73bf5dec69091706dcdccba2fc.tar.gz
userret() already checks for td_locks when INVARIANTS is enabled, so
there is no need to check if Giant is acquired after it. Reviewed by: kib MFC after: 1 week
Diffstat (limited to 'sys/ia64')
-rw-r--r--sys/ia64/ia32/ia32_trap.c1
-rw-r--r--sys/ia64/ia64/trap.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/sys/ia64/ia32/ia32_trap.c b/sys/ia64/ia32/ia32_trap.c
index 44e0648..cea8f92 100644
--- a/sys/ia64/ia32/ia32_trap.c
+++ b/sys/ia64/ia32/ia32_trap.c
@@ -278,6 +278,5 @@ ia32_trap(int vector, struct trapframe *tf)
out:
userret(td, tf);
- mtx_assert(&Giant, MA_NOTOWNED);
do_ast(tf);
}
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index d587b05..c0cdaa9 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -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;
OpenPOWER on IntegriCloud