Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e50195f authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 3e86a8c6

arch/s390/kernel/compat_linux.c

+0 −33
Original line number Diff line number Diff line
@@ -465,39 +465,6 @@ out: 
	return rc;

}





#ifdef CONFIG_MODULES



asmlinkage long

sys32_init_module(void __user *umod, unsigned long len,

		const char __user *uargs)

{

	return sys_init_module(umod, len, uargs);

}



asmlinkage long

sys32_delete_module(const char __user *name_user, unsigned int flags)

{

	return sys_delete_module(name_user, flags);

}



#else /* CONFIG_MODULES */



asmlinkage long

sys32_init_module(void __user *umod, unsigned long len,

		const char __user *uargs)

{

	return -ENOSYS;

}



asmlinkage long

sys32_delete_module(const char __user *name_user, unsigned int flags)

{

	return -ENOSYS;

}



#endif  /* CONFIG_MODULES */



asmlinkage long sys32_pread64(unsigned int fd, char __user *ubuf,

				size_t count, u32 poshi, u32 poslo)

{

arch/s390/kernel/compat_wrapper.S

+6 −6
Original line number Diff line number Diff line
@@ -568,18 +568,18 @@ compat_sys_sigprocmask_wrapper: 
	llgtr	%r4,%r4			# compat_old_sigset_t *

	jg	compat_sys_sigprocmask		# branch to system call



	.globl	sys32_init_module_wrapper

sys32_init_module_wrapper:

	.globl	sys_init_module_wrapper

sys_init_module_wrapper:

	llgtr	%r2,%r2			# void *

	llgfr	%r3,%r3			# unsigned long

	llgtr	%r4,%r4			# char *

	jg	sys32_init_module	# branch to system call

	jg	sys_init_module		# branch to system call



	.globl	sys32_delete_module_wrapper

sys32_delete_module_wrapper:

	.globl	sys_delete_module_wrapper

sys_delete_module_wrapper:

	llgtr	%r2,%r2			# const char *

	llgfr	%r3,%r3			# unsigned int

	jg	sys32_delete_module	# branch to system call

	jg	sys_delete_module	# branch to system call



	.globl	sys32_quotactl_wrapper

sys32_quotactl_wrapper:

arch/s390/kernel/syscalls.S

+2 −2
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ SYSCALL(sys_adjtimex,sys_adjtimex,compat_sys_adjtimex_wrapper) 
SYSCALL(sys_mprotect,sys_mprotect,sys32_mprotect_wrapper)	/* 125 */

SYSCALL(sys_sigprocmask,sys_sigprocmask,compat_sys_sigprocmask_wrapper)

NI_SYSCALL							/* old "create module" */

SYSCALL(sys_init_module,sys_init_module,sys32_init_module_wrapper)

SYSCALL(sys_delete_module,sys_delete_module,sys32_delete_module_wrapper)

SYSCALL(sys_init_module,sys_init_module,sys_init_module_wrapper)

SYSCALL(sys_delete_module,sys_delete_module,sys_delete_module_wrapper)

NI_SYSCALL							/* 130: old get_kernel_syms */

SYSCALL(sys_quotactl,sys_quotactl,sys32_quotactl_wrapper)

SYSCALL(sys_getpgid,sys_getpgid,sys32_getpgid_wrapper)