Skip to content

Commit f4e1f1b

Browse files
committed
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>
1 parent 3db5cf9 commit f4e1f1b

3 files changed

Lines changed: 1 addition & 3 deletions

File tree

arch/s390/include/asm/elf.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ extern char elf_platform[];
217217
do { \
218218
set_personality(PER_LINUX | \
219219
(current->personality & (~PER_MASK))); \
220-
current->thread.sys_call_table = sys_call_table; \
221220
} while (0)
222221

223222
/*

arch/s390/include/asm/processor.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ struct thread_struct {
175175
unsigned long system_timer; /* task cputime in kernel space */
176176
unsigned long hardirq_timer; /* task cputime in hardirq context */
177177
unsigned long softirq_timer; /* task cputime in softirq context */
178-
const sys_call_ptr_t *sys_call_table; /* system call table address */
179178
union teid gmap_teid; /* address and flags of last gmap fault */
180179
unsigned int gmap_int_code; /* int code of last gmap fault */
181180
int ufpu_flags; /* user fpu flags */

arch/s390/kernel/syscall.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void noinstr __do_syscall(struct pt_regs *regs, int per_trap)
122122
goto out;
123123
regs->gprs[2] = -ENOSYS;
124124
if (likely(nr < NR_syscalls))
125-
regs->gprs[2] = current->thread.sys_call_table[nr](regs);
125+
regs->gprs[2] = sys_call_table[nr](regs);
126126
out:
127127
syscall_exit_to_user_mode(regs);
128128
}

0 commit comments

Comments
 (0)