2 files changed, 12 insertions, 7 deletions

diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c
index 896863fb208a..002ab4dbe5cb 100644
--- a/arch/sparc/kernel/sys_sparc.c
+++ b/arch/sparc/kernel/sys_sparc.c
@@ -475,13 +475,13 @@ asmlinkage int sys_getdomainname(char __user *name, int len)
 
         down_read(&uts_sem);
         
-        nlen = strlen(system_utsname.domainname) + 1;
+        nlen = strlen(utsname()->domainname) + 1;
         err = -EINVAL;
         if (nlen > len)
                 goto out;
 
         err = -EFAULT;
-        if (!copy_to_user(name, system_utsname.domainname, nlen))
+        if (!copy_to_user(name, utsname()->domainname, nlen))
                 err = 0;
 
 out:
diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c
index aa0fb2efb615..9d2cd97d1c3a 100644
--- a/arch/sparc/kernel/sys_sunos.c
+++ b/arch/sparc/kernel/sys_sunos.c
@@ -483,13 +483,18 @@ asmlinkage int sunos_uname(struct sunos_utsname __user *name)
 {
         int ret;
         down_read(&uts_sem);
-        ret = copy_to_user(&name->sname[0], &system_utsname.sysname[0], sizeof(name->sname) - 1);
+        ret = copy_to_user(&name->sname[0], &utsname()->sysname[0],
+                           sizeof(name->sname) - 1);
         if (!ret) {
-                ret |= __copy_to_user(&name->nname[0], &system_utsname.nodename[0], sizeof(name->nname) - 1);
+                ret |= __copy_to_user(&name->nname[0], &utsname()->nodename[0],
+                                      sizeof(name->nname) - 1);
                 ret |= __put_user('\0', &name->nname[8]);
-                ret |= __copy_to_user(&name->rel[0], &system_utsname.release[0], sizeof(name->rel) - 1);
-                ret |= __copy_to_user(&name->ver[0], &system_utsname.version[0], sizeof(name->ver) - 1);
-                ret |= __copy_to_user(&name->mach[0], &system_utsname.machine[0], sizeof(name->mach) - 1);
+                ret |= __copy_to_user(&name->rel[0], &utsname()->release[0],
+                                      sizeof(name->rel) - 1);
+                ret |= __copy_to_user(&name->ver[0], &utsname()->version[0],
+                                      sizeof(name->ver) - 1);
+                ret |= __copy_to_user(&name->mach[0], &utsname()->machine[0],
+                                      sizeof(name->mach) - 1);
         }
         up_read(&uts_sem);
         return ret ? -EFAULT : 0;