Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1cecf2b authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

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: default avatarFrederic 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: default avatarIngo Molnar <mingo@kernel.org>
parent 16a6d9be

arch/alpha/kernel/osf_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) 
	memset(&r, 0, sizeof(r));

	switch (who) {

	case RUSAGE_SELF:

		task_cputime(current, &utime, &stime);

		task_cputime_t(current, &utime, &stime);

		utime_jiffies = cputime_to_jiffies(utime);

		stime_jiffies = cputime_to_jiffies(stime);

		jiffies_to_timeval32(utime_jiffies, &r.ru_utime);

arch/x86/kernel/apm_32.c

+1 −1
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ static int apm_cpu_idle(struct cpuidle_device *dev, 
	unsigned int bucket;



recalc:

	task_cputime(current, &utime, &stime);

	task_cputime_t(current, &utime, &stime);

	if (jiffies_since_last_check > IDLE_CALC_LIMIT) {

		use_apm_idle = 0;

	} else if (jiffies_since_last_check > idle_period) {

drivers/isdn/mISDN/stack.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ mISDNStackd(void *data) 
	       "msg %d sleep %d stopped\n",

	       dev_name(&st->dev->dev), st->msg_cnt, st->sleep_cnt,

	       st->stopped_cnt);

	task_cputime(st->thread, &utime, &stime);

	task_cputime_t(st->thread, &utime, &stime);

	printk(KERN_DEBUG

	       "mISDNStackd daemon for %s utime(%ld) stime(%ld)\n",

	       dev_name(&st->dev->dev), utime, stime);

fs/binfmt_elf.c

+3 −3
Original line number Diff line number Diff line
@@ -1421,19 +1421,19 @@ static void fill_prstatus(struct elf_prstatus *prstatus, 
	prstatus->pr_pgrp = task_pgrp_vnr(p);

	prstatus->pr_sid = task_session_vnr(p);

	if (thread_group_leader(p)) {

		struct task_cputime cputime;

		struct task_cputime_t cputime;



		/*

		 * This is the record for the group leader.  It shows the

		 * group-wide total, not its individual thread total.

		 */

		thread_group_cputime(p, &cputime);

		thread_group_cputime_t(p, &cputime);

		cputime_to_timeval(cputime.utime, &prstatus->pr_utime);

		cputime_to_timeval(cputime.stime, &prstatus->pr_stime);

	} else {

		cputime_t utime, stime;



		task_cputime(p, &utime, &stime);

		task_cputime_t(p, &utime, &stime);

		cputime_to_timeval(utime, &prstatus->pr_utime);

		cputime_to_timeval(stime, &prstatus->pr_stime);

	}

fs/binfmt_elf_fdpic.c

+3 −3
Original line number Diff line number Diff line
@@ -1342,19 +1342,19 @@ static void fill_prstatus(struct elf_prstatus *prstatus, 
	prstatus->pr_pgrp = task_pgrp_vnr(p);

	prstatus->pr_sid = task_session_vnr(p);

	if (thread_group_leader(p)) {

		struct task_cputime cputime;

		struct task_cputime_t cputime;



		/*

		 * This is the record for the group leader.  It shows the

		 * group-wide total, not its individual thread total.

		 */

		thread_group_cputime(p, &cputime);

		thread_group_cputime_t(p, &cputime);

		cputime_to_timeval(cputime.utime, &prstatus->pr_utime);

		cputime_to_timeval(cputime.stime, &prstatus->pr_stime);

	} else {

		cputime_t utime, stime;



		task_cputime(p, &utime, &stime);

		task_cputime_t(p, &utime, &stime);

		cputime_to_timeval(utime, &prstatus->pr_utime);

		cputime_to_timeval(stime, &prstatus->pr_stime);

	}