diff options
Diffstat (limited to 'sys/kern/subr_trap.c')
| -rw-r--r-- | sys/kern/subr_trap.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 15c8fdd..e9d9c35 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -147,7 +147,6 @@ ast(struct trapframe *framep) { struct thread *td; struct proc *p; - struct rlimit rlim; int sflag; int flags; int sig; @@ -183,8 +182,8 @@ ast(struct trapframe *framep) mtx_lock_spin(&sched_lock); flags = td->td_flags; sflag = p->p_sflag; - if (p->p_sflag & (PS_ALRMPEND | PS_PROFPEND | PS_XCPU)) - p->p_sflag &= ~(PS_ALRMPEND | PS_PROFPEND | PS_XCPU); + if (p->p_sflag & (PS_ALRMPEND | PS_PROFPEND)) + p->p_sflag &= ~(PS_ALRMPEND | PS_PROFPEND); #ifdef MAC if (p->p_sflag & PS_MACPEND) p->p_sflag &= ~PS_MACPEND; @@ -231,21 +230,6 @@ ast(struct trapframe *framep) psignal(p, SIGPROF); PROC_UNLOCK(p); } - if (sflag & PS_XCPU) { - PROC_LOCK(p); - lim_rlimit(p, RLIMIT_CPU, &rlim); - mtx_lock_spin(&sched_lock); - if (p->p_rux.rux_runtime >= rlim.rlim_max * cpu_tickrate()) { - mtx_unlock_spin(&sched_lock); - killproc(p, "exceeded maximum CPU limit"); - } else { - if (p->p_cpulimit < rlim.rlim_max) - p->p_cpulimit += 5; - mtx_unlock_spin(&sched_lock); - psignal(p, SIGXCPU); - } - PROC_UNLOCK(p); - } #ifdef MAC if (sflag & PS_MACPEND) mac_thread_userret(td); |
