leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sparc: get rid of asm wrapper for nis_syscall()

Browse Source 
just use current_pt_regs()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2018-03-20 10:44:21 -04:00
parent 3d0e354e4e
commit 47db69752b
5 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/sparc/kernel/entry.S
View File

@@ -801,13 +801,6 @@ SUN_PI_(lda [%l4] ASI_M_MMUREGS, %l5) ! read sfsr last
RESTORE_ALL RESTORE_ALL
.align 4 .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: sunos_execv:
.globl sunos_execv .globl sunos_execv
b sys_execve b sys_execve

5
arch/sparc/kernel/sys_sparc_32.c
View File

@@ -127,11 +127,10 @@ SYSCALL_DEFINE5(sparc_remap_file_pages, unsigned long, start, unsigned long, siz
(pgoff >> (PAGE_SHIFT - 12)), flags); (pgoff >> (PAGE_SHIFT - 12)), flags);
} }
/* we come to here via sys_nis_syscall so it can setup the regs argument */ SYSCALL_DEFINE0(nis_syscall)
asmlinkage unsigned long
c_sys_nis_syscall (struct pt_regs *regs)
{ {
static int count = 0; static int count = 0;
struct pt_regs *regs = current_pt_regs();
if (count++ > 5) if (count++ > 5)
return -ENOSYS; return -ENOSYS;

4
arch/sparc/kernel/sys_sparc_64.c
View File

@@ -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); 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 */ SYSCALL_DEFINE0(nis_syscall)
asmlinkage unsigned long c_sys_nis_syscall(struct pt_regs *regs)
{ {
static int count; static int count;
struct pt_regs *regs = current_pt_regs();
/* Don't make the system unusable, if someone goes stuck */ /* Don't make the system unusable, if someone goes stuck */
if (count++ > 5) if (count++ > 5)

3
arch/sparc/kernel/syscalls.S
View File

@@ -27,9 +27,6 @@ sys32_execveat:
#endif #endif
.align 32 .align 32
sys_nis_syscall:
ba,pt %xcc, c_sys_nis_syscall
add %sp, PTREGS_OFF, %o0
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
sys32_sigstack: sys32_sigstack:
ba,pt %xcc, do_sys32_sigstack ba,pt %xcc, do_sys32_sigstack

2
arch/sparc/kernel/systbls.h
View File

@@ -11,7 +11,7 @@
asmlinkage long sys_getpagesize(void); asmlinkage long sys_getpagesize(void);
asmlinkage long sys_sparc_pipe(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); asmlinkage long sys_getdomainname(char __user *name, int len);
void do_rt_sigreturn(struct pt_regs *regs); void do_rt_sigreturn(struct pt_regs *regs);
asmlinkage long sys_mmap(unsigned long addr, unsigned long len, asmlinkage long sys_mmap(unsigned long addr, unsigned long len,