[PATCH] consolidate sys32/compat_adjtimex

Create compat_sys_adjtimex and use it an all appropriate places.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 1 insertions, 30 deletions

diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index ca1d8dbbadf3..d286f68a3d3a 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -21,7 +21,6 @@
 #include <linux/times.h>
 #include <linux/utsname.h>
 #include <linux/time.h>
-#include <linux/timex.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/sem.h>
@@ -567,34 +566,6 @@ asmlinkage int sys32_sendfile64(int out_fd, int in_fd, compat_loff_t __user *off
 }
 
 
-asmlinkage long sys32_adjtimex(struct compat_timex __user *txc_p32)
-{
-        struct timex txc;
-        struct compat_timex t32;
-        int ret;
-        extern int do_adjtimex(struct timex *txc);
-
-        if(copy_from_user(&t32, txc_p32, sizeof(struct compat_timex)))
-                return -EFAULT;
-#undef CP
-#define CP(x) txc.x = t32.x
-        CP(modes); CP(offset); CP(freq); CP(maxerror); CP(esterror);
-        CP(status); CP(constant); CP(precision); CP(tolerance);
-        CP(time.tv_sec); CP(time.tv_usec); CP(tick); CP(ppsfreq); CP(jitter);
-        CP(shift); CP(stabil); CP(jitcnt); CP(calcnt); CP(errcnt);
-        CP(stbcnt);
-        ret = do_adjtimex(&txc);
-#undef CP
-#define CP(x) t32.x = txc.x
-        CP(modes); CP(offset); CP(freq); CP(maxerror); CP(esterror);
-        CP(status); CP(constant); CP(precision); CP(tolerance);
-        CP(time.tv_sec); CP(time.tv_usec); CP(tick); CP(ppsfreq); CP(jitter);
-        CP(shift); CP(stabil); CP(jitcnt); CP(calcnt); CP(errcnt);
-        CP(stbcnt);
-        return copy_to_user(txc_p32, &t32, sizeof(struct compat_timex)) ? -EFAULT : ret;
-}
-
-
 struct sysinfo32 {
         s32 uptime;
         u32 loads[3];
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 71011eadb872..89b6c56ea0a8 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -207,7 +207,7 @@
         /* struct sockaddr... */
         ENTRY_SAME(recvfrom)
         /* struct timex contains longs */
-        ENTRY_DIFF(adjtimex)
+        ENTRY_COMP(adjtimex)
         ENTRY_SAME(mprotect)            /* 125 */
         /* old_sigset_t forced to 32 bits.  Beware glibc sigset_t */
         ENTRY_COMP(sigprocmask)