5 files changed, 11 insertions, 119 deletions

diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index 3cad56923815..261785ab5b22 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -166,13 +166,11 @@ extern char elf_platform[];
 #define ELF_PLATFORM (elf_platform)
 
 #ifndef __s390x__
-#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
+#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
 #else /* __s390x__ */
-#define SET_PERSONALITY(ex, ibcs2)                      \
+#define SET_PERSONALITY(ex)                             \
 do {                                                    \
-        if (ibcs2)                                      \
-                set_personality(PER_SVR4);              \
-        else if (current->personality != PER_LINUX32)   \
+        if (current->personality != PER_LINUX32)        \
                 set_personality(PER_LINUX);             \
         if ((ex).e_ident[EI_CLASS] == ELFCLASS32)       \
                 set_thread_flag(TIF_31BIT);             \
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 98e246dc0233..4646382af34f 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -279,22 +279,6 @@ asmlinkage long sys32_getegid16(void)
         return high2lowgid(current->egid);
 }
 
-/* 32-bit timeval and related flotsam.  */
-
-static inline long get_tv32(struct timeval *o, struct compat_timeval __user *i)
-{
-        return (!access_ok(VERIFY_READ, o, sizeof(*o)) ||
-                (__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)));
-}
-
 /*
  * sys32_ipc() is the de-multiplexer for the SysV IPC calls in 32bit emulation.
  *
@@ -362,41 +346,6 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned
                 return sys_ftruncate(fd, (high << 32) | low);
 }
 
-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
-{
-        compat_ino_t ino;
-        int err;
-
-        if (!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;
-
-        err = put_user(old_encode_dev(stat->dev), &statbuf->st_dev);
-        err |= put_user(stat->ino, &statbuf->st_ino);
-        err |= put_user(stat->mode, &statbuf->st_mode);
-        err |= put_user(stat->nlink, &statbuf->st_nlink);
-        err |= put_user(high2lowuid(stat->uid), &statbuf->st_uid);
-        err |= put_user(high2lowgid(stat->gid), &statbuf->st_gid);
-        err |= put_user(old_encode_dev(stat->rdev), &statbuf->st_rdev);
-        err |= put_user(stat->size, &statbuf->st_size);
-        err |= put_user(stat->atime.tv_sec, &statbuf->st_atime);
-        err |= put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec);
-        err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime);
-        err |= put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec);
-        err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime);
-        err |= put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec);
-        err |= put_user(stat->blksize, &statbuf->st_blksize);
-        err |= put_user(stat->blocks, &statbuf->st_blocks);
-/* fixme
-        err |= put_user(0, &statbuf->__unused4[0]);
-        err |= put_user(0, &statbuf->__unused4[1]);
-*/
-        return err;
-}
-
 asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
                                 struct compat_timespec __user *interval)
 {
@@ -557,57 +506,6 @@ sys32_delete_module(const char __user *name_user, unsigned int flags)
 
 #endif  /* CONFIG_MODULES */
 
-/* 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;
-}
-
-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 long 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 long sys32_pread64(unsigned int fd, char __user *ubuf,
                                 size_t count, u32 poshi, u32 poslo)
 {
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h
index 05f8516366ab..836a28842900 100644
--- a/arch/s390/kernel/compat_linux.h
+++ b/arch/s390/kernel/compat_linux.h
@@ -202,10 +202,6 @@ long sys32_execve(void);
 long sys32_init_module(void __user *umod, unsigned long len,
                        const char __user *uargs);
 long sys32_delete_module(const char __user *name_user, unsigned int flags);
-long sys32_gettimeofday(struct compat_timeval __user *tv,
-                        struct timezone __user *tz);
-long sys32_settimeofday(struct compat_timeval __user *tv,
-                        struct timezone __user *tz);
 long sys32_pread64(unsigned int fd, char __user *ubuf, size_t count,
                    u32 poshi, u32 poslo);
 long sys32_pwrite64(unsigned int fd, const char __user *ubuf,
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index ee51ca9e23b5..fc2c97197a53 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -332,17 +332,17 @@ compat_sys_getrusage_wrapper:
         llgtr   %r3,%r3                 # struct rusage_emu31 *
         jg      compat_sys_getrusage    # branch to system call
 
-        .globl  sys32_gettimeofday_wrapper
-sys32_gettimeofday_wrapper:
+        .globl  compat_sys_gettimeofday_wrapper
+compat_sys_gettimeofday_wrapper:
         llgtr   %r2,%r2                 # struct timeval_emu31 *
         llgtr   %r3,%r3                 # struct timezone *
-        jg      sys32_gettimeofday      # branch to system call
+        jg      compat_sys_gettimeofday # branch to system call
 
-        .globl  sys32_settimeofday_wrapper
-sys32_settimeofday_wrapper:
+        .globl  compat_sys_settimeofday_wrapper
+compat_sys_settimeofday_wrapper:
         llgtr   %r2,%r2                 # struct timeval_emu31 *
         llgtr   %r3,%r3                 # struct timezone *
-        jg      sys32_settimeofday      # branch to system call
+        jg      compat_sys_settimeofday # branch to system call
 
         .globl  sys32_getgroups16_wrapper
 sys32_getgroups16_wrapper:
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 3ae303914b42..2d61787949d5 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -86,8 +86,8 @@ SYSCALL(sys_sethostname,sys_sethostname,sys32_sethostname_wrapper)
 SYSCALL(sys_setrlimit,sys_setrlimit,compat_sys_setrlimit_wrapper)       /* 75 */
 SYSCALL(sys_old_getrlimit,sys_getrlimit,compat_sys_old_getrlimit_wrapper)
 SYSCALL(sys_getrusage,sys_getrusage,compat_sys_getrusage_wrapper)
-SYSCALL(sys_gettimeofday,sys_gettimeofday,sys32_gettimeofday_wrapper)
-SYSCALL(sys_settimeofday,sys_settimeofday,sys32_settimeofday_wrapper)
+SYSCALL(sys_gettimeofday,sys_gettimeofday,compat_sys_gettimeofday_wrapper)
+SYSCALL(sys_settimeofday,sys_settimeofday,compat_sys_settimeofday_wrapper)
 SYSCALL(sys_getgroups16,sys_ni_syscall,sys32_getgroups16_wrapper)       /* 80 old getgroups16 syscall */
 SYSCALL(sys_setgroups16,sys_ni_syscall,sys32_setgroups16_wrapper)       /* old setgroups16 syscall */
 NI_SYSCALL                                                      /* old select syscall */