git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[sfrench/cifs-2.6.git]
/
kernel
/
sched
/
deadline.c
diff --git
a/kernel/sched/deadline.c
b/kernel/sched/deadline.c
index f349f7e98deca60b1b26ab10a0be36719866cd1e..2473736c7616dd3810b5295a8a5fe4bc4c16b92c 100644
(file)
--- 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);
- c
puacct_charg
e(curr, delta_exec);
+ c
group_account_cputim
e(curr, delta_exec);
sched_rt_avg_update(rq, delta_exec);