diff options
| author | bde <bde@FreeBSD.org> | 1998-11-26 14:05:58 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-11-26 14:05:58 +0000 |
| commit | 043d2a6202a58316ccd35b2684e63881f10f31bd (patch) | |
| tree | e25d92c4f47f48f78bcc08ad1cd50eb41b02e387 /sys/kern/kern_synch.c | |
| parent | 0d3ca540eaf1a42592a9e7bb4e4f2f99145d7c9d (diff) | |
| download | FreeBSD-src-043d2a6202a58316ccd35b2684e63881f10f31bd.zip FreeBSD-src-043d2a6202a58316ccd35b2684e63881f10f31bd.tar.gz | |
Oops, yet again back out some local changes that shouldn't have been
in the previous commit.
Diffstat (limited to 'sys/kern/kern_synch.c')
| -rw-r--r-- | sys/kern/kern_synch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 366a9d4..ae47d9b 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $Id: kern_synch.c,v 1.65 1998/10/25 20:11:36 bde Exp $ + * $Id: kern_synch.c,v 1.66 1998/11/26 14:00:08 bde Exp $ */ #include "opt_ktrace.h" @@ -293,7 +293,7 @@ schedcpu(arg) #define PPQ (128 / NQS) /* priorities per queue */ if ((p != curproc) && #ifdef SMP - p->p_oncpu == 0xff && /* idle */ + (u_char)p->p_oncpu == 0xff && /* idle */ #endif p->p_stat == SRUN && (p->p_flag & P_INMEM) && @@ -635,7 +635,7 @@ mi_switch() #ifdef SIMPLELOCK_DEBUG if (p->p_simple_locks) - Debugger("sleep: holding simple lock\n"); + printf("sleep: holding simple lock\n"); #endif /* * Compute the amount of time during which the current @@ -651,9 +651,9 @@ mi_switch() */ if (p->p_stat != SZOMB && p->p_runtime > p->p_limit->p_cpulimit) { rlim = &p->p_rlimit[RLIMIT_CPU]; - if (p->p_runtime / 1000000 >= rlim->rlim_max) + if (p->p_runtime / (rlim_t)1000000 >= rlim->rlim_max) { killproc(p, "exceeded maximum CPU limit"); - else { + } else { psignal(p, SIGXCPU); if (rlim->rlim_cur < rlim->rlim_max) { /* XXX: we should make a private copy */ |
