diff options
author | Scott Soule Cheloha <cheloha@cvs.openbsd.org> | 2023-06-21 21:16:22 +0000 |
---|---|---|
committer | Scott Soule Cheloha <cheloha@cvs.openbsd.org> | 2023-06-21 21:16:22 +0000 |
commit | d75f65d40a7b2cf83a64349d3434fae7d50c2283 (patch) | |
tree | c73cd54fb8f78feab80f4c940bab73287ffefb12 /sys/kern/sched_bsd.c | |
parent | 9d7d271e2ca581fa830b3329bc6d5a263e4c7cde (diff) |
Revert "schedcpu, uvm_meter(9): make uvm_meter() an independent timeout"
Sometimes causes boot hang after mounting root partition.
Thread 1: https://marc.info/?l=openbsd-misc&m=168736497407357&w=2
Thread 2: https://marc.info/?l=openbsd-misc&m=168737429214370&w=2
Diffstat (limited to 'sys/kern/sched_bsd.c')
-rw-r--r-- | sys/kern/sched_bsd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/sched_bsd.c b/sys/kern/sched_bsd.c index 3a82cca9b51..753edaed6f2 100644 --- a/sys/kern/sched_bsd.c +++ b/sys/kern/sched_bsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sched_bsd.c,v 1.75 2023/06/20 16:30:30 cheloha Exp $ */ +/* $OpenBSD: sched_bsd.c,v 1.76 2023/06/21 21:16:21 cheloha Exp $ */ /* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /*- @@ -234,6 +234,7 @@ schedcpu(void *arg) } SCHED_UNLOCK(s); } + uvm_meter(); wakeup(&lbolt); timeout_add_sec(to, 1); } @@ -668,7 +669,6 @@ scheduler_start(void) rrticks_init = hz / 10; schedcpu(&schedcpu_to); - uvm_meter(NULL); #ifndef SMALL_KERNEL if (perfpolicy == PERFPOL_AUTO) |