s390/syscalls: Remove system call table pointer from thread_struct

With compat support gone there is only one system call table
left. Therefore remove the sys_call_table pointer from
thread_struct and use the sys_call_table directly.

Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index 2b6ab483b1cab0a1c170dedb6dcb77c54da1a042..bb63fa4d20bb8763ea0a0eae45e74127b57c50a6 100644 (file)
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -217,7 +217,6 @@ extern char elf_platform[];
 do {                                                           \
        set_personality(PER_LINUX |                             \
                (current->personality & (~PER_MASK)));          \
-       current->thread.sys_call_table = sys_call_table;        \
 } while (0)
 
 /*

diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index e8e9e6baebddfbcbdff0723f0dc629e669b31616..3affba95845bddfc765c60832507e01659e1a976 100644 (file)
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -175,7 +175,6 @@ struct thread_struct {
        unsigned long system_timer;             /* task cputime in kernel space */
        unsigned long hardirq_timer;            /* task cputime in hardirq context */
        unsigned long softirq_timer;            /* task cputime in softirq context */
-       const sys_call_ptr_t *sys_call_table;   /* system call table address */
        union teid gmap_teid;                   /* address and flags of last gmap fault */
        unsigned int gmap_int_code;             /* int code of last gmap fault */
        int ufpu_flags;                         /* user fpu flags */

diff --git a/arch/s390/kernel/syscall.c b/arch/s390/kernel/syscall.c
index 4fee74553ca2d11c53d9b19eca7eefcd4447bea7..3b7ea1ef468a9cbaca8c6175c96059d104ab194b 100644 (file)
--- a/arch/s390/kernel/syscall.c
+++ b/arch/s390/kernel/syscall.c
@@ -122,7 +122,7 @@ void noinstr __do_syscall(struct pt_regs *regs, int per_trap)
                goto out;
        regs->gprs[2] = -ENOSYS;
        if (likely(nr < NR_syscalls))
-               regs->gprs[2] = current->thread.sys_call_table[nr](regs);
+               regs->gprs[2] = sys_call_table[nr](regs);
 out:
        syscall_exit_to_user_mode(regs);
 }