Merge drm/drm-next into drm-misc-next

[linux.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index a611d1d58c7d00525247edff32211cc9586f2c9e..a9331f101883c13aa4027f399b9624b3bc62d730 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1279,11 +1279,13 @@ SYSCALL_DEFINE1(uname, struct old_utsname __user *, name)
 
 SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
 {
-       struct oldold_utsname tmp = {};
+       struct oldold_utsname tmp;
 
        if (!name)
                return -EFAULT;
 
+       memset(&tmp, 0, sizeof(tmp));
+
        down_read(&uts_sem);
        memcpy(&tmp.sysname, &utsname()->sysname, __OLD_UTS_LEN);
        memcpy(&tmp.nodename, &utsname()->nodename, __OLD_UTS_LEN);
@@ -1763,8 +1765,8 @@ void getrusage(struct task_struct *p, int who, struct rusage *r)
        unlock_task_sighand(p, &flags);
 
 out:
-       r->ru_utime = ns_to_timeval(utime);
-       r->ru_stime = ns_to_timeval(stime);
+       r->ru_utime = ns_to_kernel_old_timeval(utime);
+       r->ru_stime = ns_to_kernel_old_timeval(stime);
 
        if (who != RUSAGE_CHILDREN) {
                struct mm_struct *mm = get_task_mm(p);