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 linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 1 Feb 2017 01:53:52 -0800 From: tip-bot for Frederic Weisbecker <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: benh@...nel.crashing.org, schwidefsky@...ibm.com, linux-kernel@...r.kernel.org, paulus@...ba.org, hpa@...or.com, mingo@...nel.org, peterz@...radead.org, wanpeng.li@...mail.com, riel@...hat.com, torvalds@...ux-foundation.org, fenghua.yu@...el.com, tglx@...utronix.de, mpe@...erman.id.au, fweisbec@...il.com, heiko.carstens@...ibm.com, sgruszka@...hat.com, tony.luck@...el.com Subject: [tip:sched/core] alpha: Convert obsolete cputime_t to nsecs Commit-ID: dc9b77b56c2e78f18139bddc844bc484fc4281ba Gitweb: http://git.kernel.org/tip/dc9b77b56c2e78f18139bddc844bc484fc4281ba Author: Frederic Weisbecker <fweisbec@...il.com> AuthorDate: Tue, 31 Jan 2017 04:09:24 +0100 Committer: Ingo Molnar <mingo@...nel.org> CommitDate: Wed, 1 Feb 2017 09:13:49 +0100 alpha: Convert obsolete cputime_t 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-9-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@...nel.org> --- arch/alpha/kernel/osf_sys.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 82ccb43..9d27a7d 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -1145,7 +1145,7 @@ struct rusage32 { SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) { struct rusage32 r; - cputime_t utime, stime; + u64 utime, stime; unsigned long utime_jiffies, stime_jiffies; if (who != RUSAGE_SELF && who != RUSAGE_CHILDREN) @@ -1154,9 +1154,9 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) memset(&r, 0, sizeof(r)); switch (who) { case RUSAGE_SELF: - task_cputime_t(current, &utime, &stime); - utime_jiffies = cputime_to_jiffies(utime); - stime_jiffies = cputime_to_jiffies(stime); + task_cputime(current, &utime, &stime); + utime_jiffies = nsecs_to_jiffies(utime); + stime_jiffies = nsecs_to_jiffies(stime); jiffies_to_timeval32(utime_jiffies, &r.ru_utime); jiffies_to_timeval32(stime_jiffies, &r.ru_stime); r.ru_minflt = current->min_flt;
Powered by blists - more mailing lists