diff options
| author | Con Kolivas <kernel@kolivas.org> | 2019-10-25 14:00:52 +1100 |
|---|---|---|
| committer | Con Kolivas <kernel@kolivas.org> | 2019-11-26 16:14:51 +1100 |
| commit | 7acac2e4000e75f3349106a8847cf1021651446b (patch) | |
| tree | d74553e460b55f1efdc75efc265f46c1889535d9 /kernel/time/posix-cpu-timers.c | |
| parent | 219d54332a09e8d8741c1e1982f5eae56099de85 (diff) | |
MultiQueue Skiplist Scheduler v0.196.5.4-muqss-196
Diffstat (limited to 'kernel/time/posix-cpu-timers.c')
| -rw-r--r-- | kernel/time/posix-cpu-timers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index 42d512fcfda2..0db83bdf7f39 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -226,7 +226,7 @@ static void task_sample_cputime(struct task_struct *p, u64 *samples) u64 stime, utime; task_cputime(p, &utime, &stime); - store_samples(samples, stime, utime, p->se.sum_exec_runtime); + store_samples(samples, stime, utime, tsk_seruntime(p)); } static void proc_sample_cputime_atomic(struct task_cputime_atomic *at, @@ -845,7 +845,7 @@ static void check_thread_timers(struct task_struct *tsk, soft = task_rlimit(tsk, RLIMIT_RTTIME); if (soft != RLIM_INFINITY) { /* Task RT timeout is accounted in jiffies. RTTIME is usec */ - unsigned long rttime = tsk->rt.timeout * (USEC_PER_SEC / HZ); + unsigned long rttime = tsk_rttimeout(tsk) * (USEC_PER_SEC / HZ); unsigned long hard = task_rlimit_max(tsk, RLIMIT_RTTIME); /* At the hard limit, send SIGKILL. No further action. */ |