aboutsummaryrefslogtreecommitdiffstats
path: root/fs/binfmt_elf.c
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2017-01-30 22:09:22 -0500
committerIngo Molnar <mingo@kernel.org>2017-02-01 03:13:48 -0500
commita1cecf2ba78e0a6de00ff99df34b662728535aa5 (patch)
tree6435af480632b1605e8075e24cc1170b29a6603f /fs/binfmt_elf.c
parent16a6d9be90373fb0b521850cd0185a4d460dd152 (diff)
sched/cputime: Introduce special task_cputime_t() API to return old-typed cputime
This API returns a task's cputime in cputime_t in order to ease the conversion of cputime internals to use nsecs units instead. Blindly converting all cputime readers to use this API now will later let us convert more smoothly and step by step all these places to use the new nsec based cputime. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@redhat.com> Cc: Stanislaw Gruszka <sgruszka@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Wanpeng Li <wanpeng.li@hotmail.com> Link: http://lkml.kernel.org/r/1485832191-26889-7-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/binfmt_elf.c')
-rw-r--r--fs/binfmt_elf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 422370293cfd..68b915650cae 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1421,19 +1421,19 @@ static void fill_prstatus(struct elf_prstatus *prstatus,
1421 prstatus->pr_pgrp = task_pgrp_vnr(p); 1421 prstatus->pr_pgrp = task_pgrp_vnr(p);
1422 prstatus->pr_sid = task_session_vnr(p); 1422 prstatus->pr_sid = task_session_vnr(p);
1423 if (thread_group_leader(p)) { 1423 if (thread_group_leader(p)) {
1424 struct task_cputime cputime; 1424 struct task_cputime_t cputime;
1425 1425
1426 /* 1426 /*
1427 * This is the record for the group leader. It shows the 1427 * This is the record for the group leader. It shows the
1428 * group-wide total, not its individual thread total. 1428 * group-wide total, not its individual thread total.
1429 */ 1429 */
1430 thread_group_cputime(p, &cputime); 1430 thread_group_cputime_t(p, &cputime);
1431 cputime_to_timeval(cputime.utime, &prstatus->pr_utime); 1431 cputime_to_timeval(cputime.utime, &prstatus->pr_utime);
1432 cputime_to_timeval(cputime.stime, &prstatus->pr_stime); 1432 cputime_to_timeval(cputime.stime, &prstatus->pr_stime);
1433 } else { 1433 } else {
1434 cputime_t utime, stime; 1434 cputime_t utime, stime;
1435 1435
1436 task_cputime(p, &utime, &stime); 1436 task_cputime_t(p, &utime, &stime);
1437 cputime_to_timeval(utime, &prstatus->pr_utime); 1437 cputime_to_timeval(utime, &prstatus->pr_utime);
1438 cputime_to_timeval(stime, &prstatus->pr_stime); 1438 cputime_to_timeval(stime, &prstatus->pr_stime);
1439 } 1439 }