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

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

sched/cputime: Remove temporary cputime_t accessors 



Now that the whole cputime conversion to nsec units is complete, we
can remove the compatibility accessors.

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-21-git-send-email-fweisbec@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 858cf3a8

include/linux/sched.h

+0 −40
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ struct sched_param { 


#include <asm/page.h>

#include <asm/ptrace.h>

#include <linux/cputime.h>



#include <linux/smp.h>

#include <linux/sem.h>
@@ -613,13 +612,6 @@ struct task_cputime { 
	unsigned long long sum_exec_runtime;

};



/* Temporary type to ease cputime_t to nsecs conversion */

struct task_cputime_t {

	cputime_t utime;

	cputime_t stime;

	unsigned long long sum_exec_runtime;

};



/* Alternate field names when used to cache expirations. */

#define virt_exp	utime

#define prof_exp	stime
@@ -2291,27 +2283,6 @@ static inline void task_cputime_scaled(struct task_struct *t, 
}

#endif



static inline void task_cputime_t(struct task_struct *t,

				  cputime_t *utime, cputime_t *stime)

{

	u64 ut, st;



	task_cputime(t, &ut, &st);

	*utime = nsecs_to_cputime(ut);

	*stime = nsecs_to_cputime(st);

}



static inline void task_cputime_t_scaled(struct task_struct *t,

					 cputime_t *utimescaled,

					 cputime_t *stimescaled)

{

	u64 ut, st;



	task_cputime_scaled(t, &ut, &st);

	*utimescaled = nsecs_to_cputime(ut);

	*stimescaled = nsecs_to_cputime(st);

}



extern void task_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st);

extern void thread_group_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st);
@@ -3527,17 +3498,6 @@ static __always_inline bool need_resched(void) 
void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times);

void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times);



static inline void thread_group_cputime_t(struct task_struct *tsk,

					  struct task_cputime_t *cputime)

{

	struct task_cputime times;



	thread_group_cputime(tsk, &times);

	cputime->utime = nsecs_to_cputime(times.utime);

	cputime->stime = nsecs_to_cputime(times.stime);

	cputime->sum_exec_runtime = times.sum_exec_runtime;

}



/*

 * Reevaluate whether the task has signals pending delivery.

 * Wake the task if so.