1 files changed, 2 insertions, 62 deletions

diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 161ce4710fe7..ba5bd626b39e 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -236,13 +236,6 @@ asmlinkage long sys32_getegid16(void)
 
 /* 32-bit timeval and related flotsam.  */
 
-static 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)) ||
@@ -757,30 +750,6 @@ asmlinkage long sys32_settimeofday(struct compat_timeval __user *tv,
         return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL);
 }
 
-asmlinkage long sys32_utimes(char __user *filename,
-                             struct compat_timeval __user *tvs)
-{
-        struct timespec tv[2];
-
-        if (tvs) {
-                struct timeval ktvs[2];
-                if (get_tv32(&ktvs[0], tvs) ||
-                    get_tv32(&ktvs[1], 1+tvs))
-                        return -EFAULT;
-
-                if (ktvs[0].tv_usec < 0 || ktvs[0].tv_usec >= 1000000 ||
-                    ktvs[1].tv_usec < 0 || ktvs[1].tv_usec >= 1000000)
-                        return -EINVAL;
-
-                tv[0].tv_sec = ktvs[0].tv_sec;
-                tv[0].tv_nsec = 1000 * ktvs[0].tv_usec;
-                tv[1].tv_sec = ktvs[1].tv_sec;
-                tv[1].tv_nsec = 1000 * ktvs[1].tv_usec;
-        }
-
-        return do_utimes(AT_FDCWD, filename, tvs ? tv : NULL, 0);
-}
-
 /* These are here just in case some old sparc32 binary calls it. */
 asmlinkage long sys32_pause(void)
 {
@@ -898,44 +867,15 @@ asmlinkage unsigned long sys32_mremap(unsigned long addr,
         unsigned long old_len, unsigned long new_len,
         unsigned long flags, u32 __new_addr)
 {
-        struct vm_area_struct *vma;
         unsigned long ret = -EINVAL;
         unsigned long new_addr = __new_addr;
 
-        if (old_len > STACK_TOP32 || new_len > STACK_TOP32)
+        if (unlikely(sparc64_mmap_check(addr, old_len)))
                 goto out;
-        if (addr > STACK_TOP32 - old_len)
+        if (unlikely(sparc64_mmap_check(new_addr, new_len)))
                 goto out;
         down_write(&current->mm->mmap_sem);
-        if (flags & MREMAP_FIXED) {
-                if (new_addr > STACK_TOP32 - new_len)
-                        goto out_sem;
-        } else if (addr > STACK_TOP32 - new_len) {
-                unsigned long map_flags = 0;
-                struct file *file = NULL;
-
-                ret = -ENOMEM;
-                if (!(flags & MREMAP_MAYMOVE))
-                        goto out_sem;
-
-                vma = find_vma(current->mm, addr);
-                if (vma) {
-                        if (vma->vm_flags & VM_SHARED)
-                                map_flags |= MAP_SHARED;
-                        file = vma->vm_file;
-                }
-
-                /* MREMAP_FIXED checked above. */
-                new_addr = get_unmapped_area(file, addr, new_len,
-                                    vma ? vma->vm_pgoff : 0,
-                                    map_flags);
-                ret = new_addr;
-                if (new_addr & ~PAGE_MASK)
-                        goto out_sem;
-                flags |= MREMAP_FIXED;
-        }
         ret = do_mremap(addr, old_len, new_len, flags, new_addr);
-out_sem:
         up_write(&current->mm->mmap_sem);
 out:
         return ret;