diff options
| author | jhb <jhb@FreeBSD.org> | 2001-01-24 11:15:59 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-01-24 11:15:59 +0000 |
| commit | a56633d331d8ebe975bcffca06119e83846e61eb (patch) | |
| tree | a82e7ac458714b98e0007ee2da6a0b29a23a8fc7 /sys/kern | |
| parent | 2a1df4043629ca3160fd4df1d95f6c0ffde3d727 (diff) | |
| download | FreeBSD-src-a56633d331d8ebe975bcffca06119e83846e61eb.zip FreeBSD-src-a56633d331d8ebe975bcffca06119e83846e61eb.tar.gz | |
- Catch up to proc flag changes.
- Assert sched_lock is held in proc_compare.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/tty.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 4d52586..d750daa 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -2307,6 +2307,7 @@ proc_compare(p1, p2) register struct proc *p1, *p2; { + mtx_assert(&sched_lock, MA_OWNED); if (p1 == NULL) return (1); @@ -2350,9 +2351,9 @@ proc_compare(p1, p2) /* * favor one sleeping in a non-interruptible sleep */ - if (p1->p_flag & P_SINTR && (p2->p_flag & P_SINTR) == 0) + if (p1->p_sflag & PS_SINTR && (p2->p_sflag & PS_SINTR) == 0) return (1); - if (p2->p_flag & P_SINTR && (p1->p_flag & P_SINTR) == 0) + if (p2->p_sflag & PS_SINTR && (p1->p_sflag & PS_SINTR) == 0) return (0); return (p2->p_pid > p1->p_pid); /* tie - return highest pid */ } |
