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

Remove unneeded assert for curproc. Simplify.

Browse Source 
Reported by:	syzkaller by markj
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Konstantin Belousov 2020-02-04 21:02:08 +00:00
parent d98eb707b0
commit 0783b70974
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_time.c
View File

@ -254,11 +254,8 @@ void
kern_thread_cputime(struct thread *targettd, struct timespec *ats) kern_thread_cputime(struct thread *targettd, struct timespec *ats)
{ {
uint64_t runtime, curtime, switchtime; uint64_t runtime, curtime, switchtime;
struct proc *p;
if (targettd == NULL) { /* current thread */ if (targettd == NULL) { /* current thread */
p = curthread->td_proc;
PROC_LOCK_ASSERT(p, MA_OWNED);
critical_enter(); critical_enter();
switchtime = PCPU_GET(switchtime); switchtime = PCPU_GET(switchtime);
curtime = cpu_ticks(); curtime = cpu_ticks();
@ -266,8 +263,7 @@ kern_thread_cputime(struct thread *targettd, struct timespec *ats)
critical_exit(); critical_exit();
runtime += curtime - switchtime; runtime += curtime - switchtime;
} else { } else {
p = targettd->td_proc; PROC_LOCK_ASSERT(targettd->td_proc, MA_OWNED);
PROC_LOCK_ASSERT(p, MA_OWNED);
thread_lock(targettd); thread_lock(targettd);
runtime = targettd->td_runtime; runtime = targettd->td_runtime;
thread_unlock(targettd); thread_unlock(targettd);