lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 1 Feb 2017 01:57:28 -0800 From: tip-bot for Frederic Weisbecker <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: sgruszka@...hat.com, riel@...hat.com, benh@...nel.crashing.org, fenghua.yu@...el.com, linux-kernel@...r.kernel.org, peterz@...radead.org, fweisbec@...il.com, torvalds@...ux-foundation.org, paulus@...ba.org, hpa@...or.com, wanpeng.li@...mail.com, heiko.carstens@...ibm.com, tglx@...utronix.de, mpe@...erman.id.au, schwidefsky@...ibm.com, tony.luck@...el.com, mingo@...nel.org Subject: [tip:sched/core] signal: Convert obsolete cputime type to nsecs Commit-ID: bde8285e5cf78417afda79f53bbc26ef801a27e7 Gitweb: http://git.kernel.org/tip/bde8285e5cf78417afda79f53bbc26ef801a27e7 Author: Frederic Weisbecker <fweisbec@...il.com> AuthorDate: Tue, 31 Jan 2017 04:09:31 +0100 Committer: Ingo Molnar <mingo@...nel.org> CommitDate: Wed, 1 Feb 2017 09:13:53 +0100 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: Frederic Weisbecker <fweisbec@...il.com> Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org> Cc: Fenghua Yu <fenghua.yu@...el.com> Cc: Heiko Carstens <heiko.carstens@...ibm.com> Cc: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Martin Schwidefsky <schwidefsky@...ibm.com> Cc: Michael Ellerman <mpe@...erman.id.au> Cc: Paul Mackerras <paulus@...ba.org> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Rik van Riel <riel@...hat.com> Cc: Stanislaw Gruszka <sgruszka@...hat.com> Cc: Thomas Gleixner <tglx@...utronix.de> Cc: Tony Luck <tony.luck@...el.com> Cc: Wanpeng Li <wanpeng.li@...mail.com> Link: http://lkml.kernel.org/r/1485832191-26889-16-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@...nel.org> --- kernel/signal.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index b635221..13f9def 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -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) {
Powered by blists - more mailing lists