diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-06 22:39:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-06 22:39:39 +0100 |
| commit | d6eabce2577a695197e9433302fd6a9f0e1a7666 (patch) | |
| tree | e5c5bcc7803879d5d911cc8faeb74a946c242395 /kernel/sched/deadline.c | |
| parent | Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff) | |
| parent | x86: don't hash faulting address in oops printout (diff) | |
| download | linux-d6eabce2577a695197e9433302fd6a9f0e1a7666.tar.xz linux-d6eabce2577a695197e9433302fd6a9f0e1a7666.zip | |
Merge branch 'linus' into perf/urgent, to synchronize UAPI headers
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/deadline.c')
| -rw-r--r-- | kernel/sched/deadline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index f349f7e98dec..2473736c7616 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -1144,7 +1144,7 @@ static void update_curr_dl(struct rq *rq) account_group_exec_runtime(curr, delta_exec); curr->se.exec_start = rq_clock_task(rq); - cpuacct_charge(curr, delta_exec); + cgroup_account_cputime(curr, delta_exec); sched_rt_avg_update(rq, delta_exec); |