4 files changed, 12 insertions, 114 deletions

diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 2fefb14414b7..aa2c55e3b55f 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -63,41 +63,6 @@
 #define merge_64(r1, r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL))
 #endif
 
-/*
- * Revalidate the inode. This is required for proper NFS attribute caching.
- */
-
-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
-{
-        struct compat_stat tmp;
-
-        if (!new_valid_dev(stat->dev) || !new_valid_dev(stat->rdev))
-                return -EOVERFLOW;
-
-        memset(&tmp, 0, sizeof(tmp));
-        tmp.st_dev = new_encode_dev(stat->dev);
-        tmp.st_ino = stat->ino;
-        if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
-                return -EOVERFLOW;
-        tmp.st_mode = stat->mode;
-        tmp.st_nlink = stat->nlink;
-        SET_UID(tmp.st_uid, stat->uid);
-        SET_GID(tmp.st_gid, stat->gid);
-        tmp.st_rdev = new_encode_dev(stat->rdev);
-        tmp.st_size = stat->size;
-        tmp.st_atime = stat->atime.tv_sec;
-        tmp.st_mtime = stat->mtime.tv_sec;
-        tmp.st_ctime = stat->ctime.tv_sec;
-#ifdef STAT_HAVE_NSEC
-        tmp.st_atime_nsec = stat->atime.tv_nsec;
-        tmp.st_mtime_nsec = stat->mtime.tv_nsec;
-        tmp.st_ctime_nsec = stat->ctime.tv_nsec;
-#endif
-        tmp.st_blocks = stat->blocks;
-        tmp.st_blksize = stat->blksize;
-        return copy_to_user(statbuf, &tmp, sizeof(tmp)) ? -EFAULT : 0;
-}
-
 asmlinkage unsigned long
 sys32_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
          unsigned long flags, unsigned long fd, unsigned long pgoff)
@@ -168,72 +133,6 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long __dummy,
         return sys_ftruncate(fd, merge_64(a2, a3));
 }
 
-static inline long
-get_tv32(struct timeval *o, struct compat_timeval __user *i)
-{
-        return (!access_ok(VERIFY_READ, i, sizeof(*i)) ||
-                (__get_user(o->tv_sec, &i->tv_sec) |
-                 __get_user(o->tv_usec, &i->tv_usec)));
-}
-
-static inline long
-put_tv32(struct compat_timeval __user *o, struct timeval *i)
-{
-        return (!access_ok(VERIFY_WRITE, o, sizeof(*o)) ||
-                (__put_user(i->tv_sec, &o->tv_sec) |
-                 __put_user(i->tv_usec, &o->tv_usec)));
-}
-
-extern struct timezone sys_tz;
-
-asmlinkage int
-sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
-{
-        if (tv) {
-                struct timeval ktv;
-                do_gettimeofday(&ktv);
-                if (put_tv32(tv, &ktv))
-                        return -EFAULT;
-        }
-        if (tz) {
-                if (copy_to_user(tz, &sys_tz, sizeof(sys_tz)))
-                        return -EFAULT;
-        }
-        return 0;
-}
-
-static inline long get_ts32(struct timespec *o, struct compat_timeval __user *i)
-{
-        long usec;
-
-        if (!access_ok(VERIFY_READ, i, sizeof(*i)))
-                return -EFAULT;
-        if (__get_user(o->tv_sec, &i->tv_sec))
-                return -EFAULT;
-        if (__get_user(usec, &i->tv_usec))
-                return -EFAULT;
-        o->tv_nsec = usec * 1000;
-                return 0;
-}
-
-asmlinkage int
-sys32_settimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
-{
-        struct timespec kts;
-        struct timezone ktz;
-
-        if (tv) {
-                if (get_ts32(&kts, tv))
-                        return -EFAULT;
-        }
-        if (tz) {
-                if (copy_from_user(&ktz, tz, sizeof(ktz)))
-                        return -EFAULT;
-        }
-
-        return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL);
-}
-
 asmlinkage int sys32_llseek(unsigned int fd, unsigned int offset_high,
                             unsigned int offset_low, loff_t __user * result,
                             unsigned int origin)
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 324c5499dec2..e266b3aa6560 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -214,7 +214,7 @@ EXPORT(sysn32_call_table)
         PTR     sys_fchown
         PTR     sys_lchown
         PTR     sys_umask
-        PTR     sys32_gettimeofday
+        PTR     compat_sys_gettimeofday
         PTR     compat_sys_getrlimit            /* 6095 */
         PTR     compat_sys_getrusage
         PTR     compat_sys_sysinfo
@@ -279,7 +279,7 @@ EXPORT(sysn32_call_table)
         PTR     sys_chroot
         PTR     sys_sync
         PTR     sys_acct
-        PTR     sys32_settimeofday
+        PTR     compat_sys_settimeofday
         PTR     compat_sys_mount                /* 6160 */
         PTR     sys_umount
         PTR     sys_swapon
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 85fedac99a57..6c7ef8313ebd 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -283,8 +283,8 @@ sys_call_table:
         PTR     compat_sys_setrlimit            /* 4075 */
         PTR     compat_sys_getrlimit
         PTR     compat_sys_getrusage
-        PTR     sys32_gettimeofday
-        PTR     sys32_settimeofday
+        PTR     compat_sys_gettimeofday
+        PTR     compat_sys_settimeofday
         PTR     sys_getgroups                   /* 4080 */
         PTR     sys_setgroups
         PTR     sys_ni_syscall                  /* old_select */
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
index 866881ec0cf8..8f88886feb12 100644
--- a/arch/mips/lasat/sysctl.c
+++ b/arch/mips/lasat/sysctl.c
@@ -38,14 +38,13 @@
 #endif
 
 /* Strategy function to write EEPROM after changing string entry */
-int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
+int sysctl_lasatstring(ctl_table *table,
                 void *oldval, size_t *oldlenp,
                 void *newval, size_t newlen)
 {
         int r;
 
-        r = sysctl_string(table, name,
-                          nlen, oldval, oldlenp, newval, newlen);
+        r = sysctl_string(table, oldval, oldlenp, newval, newlen);
         if (r < 0)
                 return r;
 
@@ -113,13 +112,13 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
 #endif
 
 /* Sysctl for setting the IP addresses */
-int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
+int sysctl_lasat_intvec(ctl_table *table,
                     void *oldval, size_t *oldlenp,
                     void *newval, size_t newlen)
 {
         int r;
 
-        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
+        r = sysctl_intvec(table, oldval, oldlenp, newval, newlen);
         if (r < 0)
                 return r;
 
@@ -131,7 +130,7 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
 
 #ifdef CONFIG_DS1603
 /* Same for RTC */
-int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
+int sysctl_lasat_rtc(ctl_table *table,
                     void *oldval, size_t *oldlenp,
                     void *newval, size_t newlen)
 {
@@ -140,7 +139,7 @@ int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
         rtctmp = read_persistent_clock();
         if (rtctmp < 0)
                 rtctmp = 0;
-        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
+        r = sysctl_intvec(table, oldval, oldlenp, newval, newlen);
         if (r < 0)
                 return r;
         if (newval && newlen)
@@ -211,13 +210,13 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
 }
 #endif
 
-static int sysctl_lasat_prid(ctl_table *table, int *name, int nlen,
+static int sysctl_lasat_prid(ctl_table *table,
                                      void *oldval, size_t *oldlenp,
                                      void *newval, size_t newlen)
 {
         int r;
 
-        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
+        r = sysctl_intvec(table, oldval, oldlenp, newval, newlen);
         if (r < 0)
                 return r;
         if (newval && newlen) {