Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[S390] Get rid of init_module/delete_module compat functions.

These functions aren't needed. Might be a leftover of the pre
cond_syscall time.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Heiko Carstens and committed by
Martin Schwidefsky
2e50195f 3e86a8c6

+8 -41
-33
arch/s390/kernel/compat_linux.c
··· 465 465 return rc; 466 466 } 467 467 468 - 469 - #ifdef CONFIG_MODULES 470 - 471 - asmlinkage long 472 - sys32_init_module(void __user *umod, unsigned long len, 473 - const char __user *uargs) 474 - { 475 - return sys_init_module(umod, len, uargs); 476 - } 477 - 478 - asmlinkage long 479 - sys32_delete_module(const char __user *name_user, unsigned int flags) 480 - { 481 - return sys_delete_module(name_user, flags); 482 - } 483 - 484 - #else /* CONFIG_MODULES */ 485 - 486 - asmlinkage long 487 - sys32_init_module(void __user *umod, unsigned long len, 488 - const char __user *uargs) 489 - { 490 - return -ENOSYS; 491 - } 492 - 493 - asmlinkage long 494 - sys32_delete_module(const char __user *name_user, unsigned int flags) 495 - { 496 - return -ENOSYS; 497 - } 498 - 499 - #endif /* CONFIG_MODULES */ 500 - 501 468 asmlinkage long sys32_pread64(unsigned int fd, char __user *ubuf, 502 469 size_t count, u32 poshi, u32 poslo) 503 470 {
+6 -6
arch/s390/kernel/compat_wrapper.S
··· 568 568 llgtr %r4,%r4 # compat_old_sigset_t * 569 569 jg compat_sys_sigprocmask # branch to system call 570 570 571 - .globl sys32_init_module_wrapper 572 - sys32_init_module_wrapper: 571 + .globl sys_init_module_wrapper 572 + sys_init_module_wrapper: 573 573 llgtr %r2,%r2 # void * 574 574 llgfr %r3,%r3 # unsigned long 575 575 llgtr %r4,%r4 # char * 576 - jg sys32_init_module # branch to system call 576 + jg sys_init_module # branch to system call 577 577 578 - .globl sys32_delete_module_wrapper 579 - sys32_delete_module_wrapper: 578 + .globl sys_delete_module_wrapper 579 + sys_delete_module_wrapper: 580 580 llgtr %r2,%r2 # const char * 581 581 llgfr %r3,%r3 # unsigned int 582 - jg sys32_delete_module # branch to system call 582 + jg sys_delete_module # branch to system call 583 583 584 584 .globl sys32_quotactl_wrapper 585 585 sys32_quotactl_wrapper:
+2 -2
arch/s390/kernel/syscalls.S
··· 136 136 SYSCALL(sys_mprotect,sys_mprotect,sys32_mprotect_wrapper) /* 125 */ 137 137 SYSCALL(sys_sigprocmask,sys_sigprocmask,compat_sys_sigprocmask_wrapper) 138 138 NI_SYSCALL /* old "create module" */ 139 - SYSCALL(sys_init_module,sys_init_module,sys32_init_module_wrapper) 140 - SYSCALL(sys_delete_module,sys_delete_module,sys32_delete_module_wrapper) 139 + SYSCALL(sys_init_module,sys_init_module,sys_init_module_wrapper) 140 + SYSCALL(sys_delete_module,sys_delete_module,sys_delete_module_wrapper) 141 141 NI_SYSCALL /* 130: old get_kernel_syms */ 142 142 SYSCALL(sys_quotactl,sys_quotactl,sys32_quotactl_wrapper) 143 143 SYSCALL(sys_getpgid,sys_getpgid,sys32_getpgid_wrapper)