diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-03-15 00:08:42 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-03-15 00:08:42 +0000 |
| commit | aaf23663cac3ee7d99b8dd91ddf9616262bbe74b (patch) | |
| tree | 31413dde4ef790b648646177f7c3c4e32297df43 /sys/kern | |
| parent | 95c7a749eb953931b4ecd454e9bfbb6650f97ef5 (diff) | |
kill 10 minute non-root suffers stuff. noted that we still have this, by
matthieu, who noted it now that X is not running as root. ok nordin
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_synch.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index d2f08bed8f6..0e7849830f7 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_synch.c,v 1.46 2002/10/15 20:17:22 art Exp $ */ +/* $OpenBSD: kern_synch.c,v 1.47 2003/03/15 00:08:41 deraadt Exp $ */ /* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /*- @@ -725,8 +725,7 @@ mi_switch() /* * Check if the process exceeds its cpu resource allocation. - * If over max, kill it. In any case, if it has run for more - * than 10 minutes, reduce priority to give others a chance. + * If over max, kill it. */ rlim = &p->p_rlimit[RLIMIT_CPU]; if (s >= rlim->rlim_cur) { @@ -738,11 +737,6 @@ mi_switch() rlim->rlim_cur += 5; } } - if (s > 10 * 60 && p->p_ucred->cr_uid && p->p_nice == NZERO) { - p->p_nice = NZERO + 4; - resetpriority(p); - } - /* * Process is about to yield the CPU; clear the appropriate |