Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6:
  [PA-RISC] Fix time.c for new do_timer() calling convention
  [PA-RISC] Fix must_check warnings in drivers.c
  [PA-RISC] Fix parisc_newuname()
  [PA-RISC] Remove warning from pci.c
  [PA-RISC] Fix filldir warnings
  [PA-RISC] Fix sys32_sysctl
  [PA-RISC] Fix sba_iommu compilation

1 files changed, 10 insertions, 23 deletions

diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
index 1db5588ceacf..512642d8f707 100644
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
@@ -266,30 +266,17 @@ long parisc_personality(unsigned long personality)
         return err;
 }
 
-static inline int override_machine(char __user *mach) {
-#ifdef CONFIG_COMPAT
-        if (personality(current->personality) == PER_LINUX32) {
-                if (__put_user(0, mach + 6) ||
-                    __put_user(0, mach + 7))
-                        return -EFAULT;
-        }
-
-        return 0;
-#else /*!CONFIG_COMPAT*/
-        return 0;
-#endif /*CONFIG_COMPAT*/
-}
-
-long parisc_newuname(struct new_utsname __user *utsname)
+long parisc_newuname(struct new_utsname __user *name)
 {
-        int err = 0;
+        int err = sys_newuname(name);
 
-        down_read(&uts_sem);
-        if (copy_to_user(utsname, &system_utsname, sizeof(*utsname)))
-                err = -EFAULT;
-        up_read(&uts_sem);
-
-        err = override_machine(utsname->machine);
+#ifdef CONFIG_COMPAT
+        if (!err && personality(current->personality) == PER_LINUX32) {
+                if (__put_user(0, name->machine + 6) ||
+                    __put_user(0, name->machine + 7))
+                        err = -EFAULT;
+        }
+#endif
 
-        return (long)err;
+        return err;
 }