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>

diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index c157655..b929414 100644 (file)
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -606,9 +606,9 @@ SYSCALL_DEFINE5(utrap_install, utrap_entry_t, type,
        return 0;
 }
 
-asmlinkage long sparc_memory_ordering(unsigned long model,
-                                     struct pt_regs *regs)
+SYSCALL_DEFINE1(memory_ordering, unsigned long, model)
 {
+       struct pt_regs *regs = current_pt_regs();
        if (model >= 3)
                return -EINVAL;
        regs->tstate = (regs->tstate & ~TSTATE_MM) | (model << 14);

diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
index f4c8fa7..d7d86b9 100644 (file)
--- a/arch/sparc/kernel/syscalls.S
+++ b/arch/sparc/kernel/syscalls.S
@@ -30,9 +30,6 @@ sys32_execveat:
 sys_nis_syscall:
        ba,pt   %xcc, c_sys_nis_syscall
         add    %sp, PTREGS_OFF, %o0
-sys_memory_ordering:
-       ba,pt   %xcc, sparc_memory_ordering
-        add    %sp, PTREGS_OFF, %o1
 #ifdef CONFIG_COMPAT
 sys32_sigstack:
        ba,pt   %xcc, do_sys32_sigstack

diff --git a/arch/sparc/kernel/systbls.h b/arch/sparc/kernel/systbls.h
index 432aa84..3352dba 100644 (file)
--- a/arch/sparc/kernel/systbls.h
+++ b/arch/sparc/kernel/systbls.h
@@ -46,8 +46,7 @@ asmlinkage long sys_utrap_install(utrap_entry_t type,
                                  utrap_handler_t new_d,
                                  utrap_handler_t __user *old_p,
                                  utrap_handler_t __user *old_d);
-asmlinkage long sparc_memory_ordering(unsigned long model,
-                                     struct pt_regs *regs);
+asmlinkage long sys_memory_ordering(unsigned long model);
 asmlinkage void sparc64_set_context(struct pt_regs *regs);
 asmlinkage void sparc64_get_context(struct pt_regs *regs);
 asmlinkage long sys32_truncate64(const char __user * path,