hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sparc: get rid of memory_ordering(2) wrapper 

use current_pt_regs() in it instead

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2018-03-19 23:26:39 -04:00
parent ee076e81fc
commit 6de7617e88
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -606,9 +606,9 @@ SYSCALL_DEFINE5(utrap_install, utrap_entry_t, type,
return 0; return 0;
} }
asmlinkage long sparc_memory_ordering(unsigned long model, SYSCALL_DEFINE1(memory_ordering, unsigned long, model)
struct pt_regs *regs)
{ {
struct pt_regs *regs = current_pt_regs();
if (model >= 3) if (model >= 3)
return -EINVAL; return -EINVAL;
regs->tstate = (regs->tstate & ~TSTATE_MM) | (model << 14); regs->tstate = (regs->tstate & ~TSTATE_MM) | (model << 14);

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

@ -30,9 +30,6 @@ sys32_execveat:
sys_nis_syscall: sys_nis_syscall:
ba,pt %xcc, c_sys_nis_syscall ba,pt %xcc, c_sys_nis_syscall
add %sp, PTREGS_OFF, %o0 add %sp, PTREGS_OFF, %o0
sys_memory_ordering:
ba,pt %xcc, sparc_memory_ordering
add %sp, PTREGS_OFF, %o1
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
sys32_sigstack: sys32_sigstack:
ba,pt %xcc, do_sys32_sigstack ba,pt %xcc, do_sys32_sigstack

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

@ -46,8 +46,7 @@ asmlinkage long sys_utrap_install(utrap_entry_t type,
utrap_handler_t new_d, utrap_handler_t new_d,
utrap_handler_t __user *old_p, utrap_handler_t __user *old_p,
utrap_handler_t __user *old_d); utrap_handler_t __user *old_d);
asmlinkage long sparc_memory_ordering(unsigned long model, asmlinkage long sys_memory_ordering(unsigned long model);
struct pt_regs *regs);
asmlinkage void sparc64_set_context(struct pt_regs *regs); asmlinkage void sparc64_set_context(struct pt_regs *regs);
asmlinkage void sparc64_get_context(struct pt_regs *regs); asmlinkage void sparc64_get_context(struct pt_regs *regs);
asmlinkage long sys32_truncate64(const char __user * path, asmlinkage long sys32_truncate64(const char __user * path,