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

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

signal: Convert obsolete cputime type to nsecs 



Use the new nsec based cputime accessors as part of the whole cputime
conversion from cputime_t to nsecs.

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


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

kernel/signal.c

+8 −8
Original line number Diff line number Diff line
@@ -1581,7 +1581,7 @@ bool do_notify_parent(struct task_struct *tsk, int sig) 
	unsigned long flags;

	struct sighand_struct *psig;

	bool autoreap = false;

	cputime_t utime, stime;

	u64 utime, stime;



	BUG_ON(sig == -1);
@@ -1619,9 +1619,9 @@ bool do_notify_parent(struct task_struct *tsk, int sig) 
				       task_uid(tsk));

	rcu_read_unlock();



	task_cputime_t(tsk, &utime, &stime);

	info.si_utime = cputime_to_clock_t(utime + nsecs_to_cputime(tsk->signal->utime));

	info.si_stime = cputime_to_clock_t(stime + nsecs_to_cputime(tsk->signal->stime));

	task_cputime(tsk, &utime, &stime);

	info.si_utime = nsec_to_clock_t(utime + tsk->signal->utime);

	info.si_stime = nsec_to_clock_t(stime + tsk->signal->stime);



	info.si_status = tsk->exit_code & 0x7f;

	if (tsk->exit_code & 0x80)
@@ -1685,7 +1685,7 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, 
	unsigned long flags;

	struct task_struct *parent;

	struct sighand_struct *sighand;

	cputime_t utime, stime;

	u64 utime, stime;



	if (for_ptracer) {

		parent = tsk->parent;
@@ -1704,9 +1704,9 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, 
	info.si_uid = from_kuid_munged(task_cred_xxx(parent, user_ns), task_uid(tsk));

	rcu_read_unlock();



	task_cputime_t(tsk, &utime, &stime);

	info.si_utime = cputime_to_clock_t(utime);

	info.si_stime = cputime_to_clock_t(stime);

	task_cputime(tsk, &utime, &stime);

	info.si_utime = nsec_to_clock_t(utime);

	info.si_stime = nsec_to_clock_t(stime);



 	info.si_code = why;

 	switch (why) {