4 files changed, 5 insertions, 96 deletions

diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index 4f0c30c38e99..f92bdaac8976 100644
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -41,7 +41,7 @@ randomize_stack_top(unsigned long stack_top);
 #define elf_map                         elf32_map
 
 #undef SET_PERSONALITY
-#define SET_PERSONALITY(ex, ibcs2)      elf32_set_personality()
+#define SET_PERSONALITY(ex)     elf32_set_personality()
 
 #define elf_read_implies_exec(ex, have_pt_gnu_stack)    (!(have_pt_gnu_stack))
 
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S
index ff88c48c5d19..53505bb04771 100644
--- a/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@ -251,8 +251,8 @@ ia32_syscall_table:
         data8 compat_sys_setrlimit        /* 75 */
         data8 compat_sys_old_getrlimit
         data8 compat_sys_getrusage
-        data8 sys32_gettimeofday
-        data8 sys32_settimeofday
+        data8 compat_sys_gettimeofday
+        data8 compat_sys_settimeofday
         data8 sys32_getgroups16   /* 80 */
         data8 sys32_setgroups16
         data8 sys32_old_select
diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h
index dd0c53687a96..0f15349c3c6b 100644
--- a/arch/ia64/ia32/ia32priv.h
+++ b/arch/ia64/ia32/ia32priv.h
@@ -332,8 +332,8 @@ void ia64_elf32_init(struct pt_regs *regs);
 #define ELF_PLATFORM    NULL
 
 #ifdef __KERNEL__
-# define SET_PERSONALITY(EX,IBCS2)                              \
-        (current->personality = (IBCS2) ? PER_SVR4 : PER_LINUX)
+# define SET_PERSONALITY(EX)                            \
+        (current->personality = PER_LINUX)
 #endif
 
 #define IA32_EFLAG      0x200
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index bf196cbb3796..f4430bb4bbdc 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -118,41 +118,6 @@ sys32_execve (char __user *name, compat_uptr_t __user *argv, compat_uptr_t __use
         return error;
 }
 
-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
-{
-        compat_ino_t ino;
-        int err;
-
-        if ((u64) stat->size > MAX_NON_LFS ||
-            !old_valid_dev(stat->dev) ||
-            !old_valid_dev(stat->rdev))
-                return -EOVERFLOW;
-
-        ino = stat->ino;
-        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
-                return -EOVERFLOW;
-
-        if (clear_user(ubuf, sizeof(*ubuf)))
-                return -EFAULT;
-
-        err  = __put_user(old_encode_dev(stat->dev), &ubuf->st_dev);
-        err |= __put_user(ino, &ubuf->st_ino);
-        err |= __put_user(stat->mode, &ubuf->st_mode);
-        err |= __put_user(stat->nlink, &ubuf->st_nlink);
-        err |= __put_user(high2lowuid(stat->uid), &ubuf->st_uid);
-        err |= __put_user(high2lowgid(stat->gid), &ubuf->st_gid);
-        err |= __put_user(old_encode_dev(stat->rdev), &ubuf->st_rdev);
-        err |= __put_user(stat->size, &ubuf->st_size);
-        err |= __put_user(stat->atime.tv_sec, &ubuf->st_atime);
-        err |= __put_user(stat->atime.tv_nsec, &ubuf->st_atime_nsec);
-        err |= __put_user(stat->mtime.tv_sec, &ubuf->st_mtime);
-        err |= __put_user(stat->mtime.tv_nsec, &ubuf->st_mtime_nsec);
-        err |= __put_user(stat->ctime.tv_sec, &ubuf->st_ctime);
-        err |= __put_user(stat->ctime.tv_nsec, &ubuf->st_ctime_nsec);
-        err |= __put_user(stat->blksize, &ubuf->st_blksize);
-        err |= __put_user(stat->blocks, &ubuf->st_blocks);
-        return err;
-}
 
 #if PAGE_SHIFT > IA32_PAGE_SHIFT
 
@@ -1148,68 +1113,12 @@ sys32_pipe (int __user *fd)
         return retval;
 }
 
-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)));
-}
-
 asmlinkage unsigned long
 sys32_alarm (unsigned int seconds)
 {
         return alarm_setitimer(seconds);
 }
 
-/* Translations due to time_t size differences.  Which affects all
-   sorts of things, like timeval and itimerval.  */
-
-extern struct timezone sys_tz;
-
-asmlinkage long
-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;
-}
-
-asmlinkage long
-sys32_settimeofday (struct compat_timeval __user *tv, struct timezone __user *tz)
-{
-        struct timeval ktv;
-        struct timespec kts;
-        struct timezone ktz;
-
-        if (tv) {
-                if (get_tv32(&ktv, tv))
-                        return -EFAULT;
-                kts.tv_sec = ktv.tv_sec;
-                kts.tv_nsec = ktv.tv_usec * 1000;
-        }
-        if (tz) {
-                if (copy_from_user(&ktz, tz, sizeof(ktz)))
-                        return -EFAULT;
-        }
-
-        return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL);
-}
-
 struct sel_arg_struct {
         unsigned int n;
         unsigned int inp;