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

Commit 47db6975 authored by Al Viro's avatar Al Viro
Browse files

sparc: get rid of asm wrapper for nis_syscall() 



just use current_pt_regs()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3d0e354e

arch/sparc/kernel/entry.S

+0 −7
Original line number Diff line number Diff line
@@ -801,13 +801,6 @@ SUN_PI_(lda [%l4] ASI_M_MMUREGS, %l5) ! read sfsr last 
	RESTORE_ALL



	.align	4

	.globl	sys_nis_syscall

sys_nis_syscall:

	mov	%o7, %l5

	add	%sp, STACKFRAME_SZ, %o0		! pt_regs *regs arg

	call	c_sys_nis_syscall

	 mov	%l5, %o7



sunos_execv:

	.globl	sunos_execv

	b	sys_execve

arch/sparc/kernel/sys_sparc_32.c

+2 −3
Original line number Diff line number Diff line
@@ -127,11 +127,10 @@ SYSCALL_DEFINE5(sparc_remap_file_pages, unsigned long, start, unsigned long, siz 
				    (pgoff >> (PAGE_SHIFT - 12)), flags);

}



/* we come to here via sys_nis_syscall so it can setup the regs argument */

asmlinkage unsigned long

c_sys_nis_syscall (struct pt_regs *regs)

SYSCALL_DEFINE0(nis_syscall)

{

	static int count = 0;

	struct pt_regs *regs = current_pt_regs();



	if (count++ > 5)

		return -ENOSYS;

arch/sparc/kernel/sys_sparc_64.c

+2 −2
Original line number Diff line number Diff line
@@ -480,10 +480,10 @@ SYSCALL_DEFINE5(64_mremap, unsigned long, addr, unsigned long, old_len, 
	return sys_mremap(addr, old_len, new_len, flags, new_addr);

}



/* we come to here via sys_nis_syscall so it can setup the regs argument */

asmlinkage unsigned long c_sys_nis_syscall(struct pt_regs *regs)

SYSCALL_DEFINE0(nis_syscall)

{

	static int count;

	struct pt_regs *regs = current_pt_regs();

	

	/* Don't make the system unusable, if someone goes stuck */

	if (count++ > 5)

arch/sparc/kernel/syscalls.S

+0 −3
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ sys32_execveat: 
#endif



	.align	32

sys_nis_syscall:

	ba,pt	%xcc, c_sys_nis_syscall

	 add	%sp, PTREGS_OFF, %o0

#ifdef CONFIG_COMPAT

sys32_sigstack:

	ba,pt	%xcc, do_sys32_sigstack

arch/sparc/kernel/systbls.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


asmlinkage long sys_getpagesize(void);

asmlinkage long sys_sparc_pipe(void);

asmlinkage unsigned long c_sys_nis_syscall(struct pt_regs *regs);

asmlinkage long sys_nis_syscall(void);

asmlinkage long sys_getdomainname(char __user *name, int len);

void do_rt_sigreturn(struct pt_regs *regs);

asmlinkage long sys_mmap(unsigned long addr, unsigned long len,