Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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@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-9-git-send-email-fweisbec@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Frederic Weisbecker and committed by
Ingo Molnar
dc9b77b5 5613fda9

+4 -4
+4 -4
arch/alpha/kernel/osf_sys.c
··· 1145 1145 SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) 1146 1146 { 1147 1147 struct rusage32 r; 1148 - cputime_t utime, stime; 1148 + u64 utime, stime; 1149 1149 unsigned long utime_jiffies, stime_jiffies; 1150 1150 1151 1151 if (who != RUSAGE_SELF && who != RUSAGE_CHILDREN) ··· 1154 1154 memset(&r, 0, sizeof(r)); 1155 1155 switch (who) { 1156 1156 case RUSAGE_SELF: 1157 - task_cputime_t(current, &utime, &stime); 1158 - utime_jiffies = cputime_to_jiffies(utime); 1159 - stime_jiffies = cputime_to_jiffies(stime); 1157 + task_cputime(current, &utime, &stime); 1158 + utime_jiffies = nsecs_to_jiffies(utime); 1159 + stime_jiffies = nsecs_to_jiffies(stime); 1160 1160 jiffies_to_timeval32(utime_jiffies, &r.ru_utime); 1161 1161 jiffies_to_timeval32(stime_jiffies, &r.ru_stime); 1162 1162 r.ru_minflt = current->min_flt;