um: make copy_sc() static

... and kill it in amd64 - not used.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h
index 3c34122..0f14838 100644 (file)
--- a/arch/um/include/shared/kern_util.h
+++ b/arch/um/include/shared/kern_util.h
@@ -21,7 +21,6 @@ extern unsigned long alloc_stack(int order, int atomic);
 extern void free_stack(unsigned long stack, int order);
 
 extern int do_signal(void);
-extern void copy_sc(struct uml_pt_regs *regs, void *from);
 extern void interrupt_end(void);
 extern void relay_signal(int sig, struct uml_pt_regs *regs);
 

diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c
index 4403b48..b87195b 100644 (file)
--- a/arch/um/sys-i386/signal.c
+++ b/arch/um/sys-i386/signal.c
@@ -10,7 +10,7 @@
 #include "frame_kern.h"
 #include "skas.h"
 
-void copy_sc(struct uml_pt_regs *regs, void *from)
+static void copy_sc(struct uml_pt_regs *regs, void *from)
 {
        struct sigcontext *sc = from;
 

diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c
index ccfa554..61ad980 100644 (file)
--- a/arch/um/sys-x86_64/signal.c
+++ b/arch/um/sys-x86_64/signal.c
@@ -13,36 +13,6 @@
 #include "frame_kern.h"
 #include "skas.h"
 
-void copy_sc(struct uml_pt_regs *regs, void *from)
-{
-       struct sigcontext *sc = from;
-
-#define GETREG(regs, regno, sc, regname)                               \
-       (regs)->gp[(regno) / sizeof(unsigned long)] = (sc)->regname
-
-       GETREG(regs, R8, sc, r8);
-       GETREG(regs, R9, sc, r9);
-       GETREG(regs, R10, sc, r10);
-       GETREG(regs, R11, sc, r11);
-       GETREG(regs, R12, sc, r12);
-       GETREG(regs, R13, sc, r13);
-       GETREG(regs, R14, sc, r14);
-       GETREG(regs, R15, sc, r15);
-       GETREG(regs, RDI, sc, di);
-       GETREG(regs, RSI, sc, si);
-       GETREG(regs, RBP, sc, bp);
-       GETREG(regs, RBX, sc, bx);
-       GETREG(regs, RDX, sc, dx);
-       GETREG(regs, RAX, sc, ax);
-       GETREG(regs, RCX, sc, cx);
-       GETREG(regs, RSP, sc, sp);
-       GETREG(regs, RIP, sc, ip);
-       GETREG(regs, EFLAGS, sc, flags);
-       GETREG(regs, CS, sc, cs);
-
-#undef GETREG
-}
-
 static int copy_sc_from_user(struct pt_regs *regs,
                             struct sigcontext __user *from)
 {