d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

userret() already checks for td_locks when INVARIANTS is enabled, so

Browse Source 
there is no need to check if Giant is acquired after it.

Reviewed by:	kib
MFC after:	1 week
This commit is contained in:
Attilio Rao 2012-09-08 18:27:11 +00:00
parent 1c978ec48b
commit 324e57150d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=240244
10 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/amd64/amd64/trap.c
View File

@ -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:

1
sys/i386/i386/trap.c
View File

@ -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:

1
sys/ia64/ia32/ia32_trap.c
View File

@ -278,6 +278,5 @@ ia32_trap(int vector, struct trapframe *tf)
out:
userret(td, tf);
mtx_assert(&Giant, MA_NOTOWNED);
do_ast(tf);
}

1
sys/ia64/ia64/trap.c
View File

@ -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;

1
sys/kern/kern_fork.c
View File

@ -1055,5 +1055,4 @@ fork_return(struct thread *td, struct trapframe *frame)
if (KTRPOINT(td, KTR_SYSRET))
ktrsysret(SYS_fork, 0, 0);
#endif
mtx_assert(&Giant, MA_NOTOWNED);
}

1
sys/kern/subr_trap.c
View File

@ -260,7 +260,6 @@ ast(struct trapframe *framep)
}
userret(td, framep);
mtx_assert(&Giant, MA_NOTOWNED);
}
const char *

1
sys/mips/mips/trap.c
View File

@ -1095,7 +1095,6 @@ trap(struct trapframe *trapframe)
* Note: we should only get here if returning to user mode.
*/
userret(td, trapframe);
mtx_assert(&Giant, MA_NOTOWNED);
return (trapframe->pc);
}

1
sys/powerpc/aim/trap.c
View File

@ -297,7 +297,6 @@ trap(struct trapframe *frame)
}
userret(td, frame);
mtx_assert(&Giant, MA_NOTOWNED);
}
static void

1
sys/powerpc/booke/trap.c
View File

@ -249,7 +249,6 @@ trap(struct trapframe *frame)
}
userret(td, frame);
mtx_assert(&Giant, MA_NOTOWNED);
}
static void

1
sys/sparc64/sparc64/trap.c
View File

@ -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"));