Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block

[linux.git] / fs / binfmt_elf.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index c5642bcb6b468f9ed4e4fe2ff7012eb4fe024f9f..5372eabd276ab6ec31d6e70f5de0a460cb8ffae9 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1489,18 +1489,18 @@ static void fill_prstatus(struct elf_prstatus *prstatus,
                 * group-wide total, not its individual thread total.
                 */
                thread_group_cputime(p, &cputime);
-               prstatus->pr_utime = ns_to_timeval(cputime.utime);
-               prstatus->pr_stime = ns_to_timeval(cputime.stime);
+               prstatus->pr_utime = ns_to_kernel_old_timeval(cputime.utime);
+               prstatus->pr_stime = ns_to_kernel_old_timeval(cputime.stime);
        } else {
                u64 utime, stime;
 
                task_cputime(p, &utime, &stime);
-               prstatus->pr_utime = ns_to_timeval(utime);
-               prstatus->pr_stime = ns_to_timeval(stime);
+               prstatus->pr_utime = ns_to_kernel_old_timeval(utime);
+               prstatus->pr_stime = ns_to_kernel_old_timeval(stime);
        }
 
-       prstatus->pr_cutime = ns_to_timeval(p->signal->cutime);
-       prstatus->pr_cstime = ns_to_timeval(p->signal->cstime);
+       prstatus->pr_cutime = ns_to_kernel_old_timeval(p->signal->cutime);
+       prstatus->pr_cstime = ns_to_kernel_old_timeval(p->signal->cstime);
 }
 
 static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,