diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 20:00:39 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 14:14:42 +0100 |
| commit | 3d72210bdc1ef67b72ffbd3e74873cae7287f2c6 (patch) | |
| tree | 67194001cb7492cb51d9058e7f4252c31077b4ca | |
| parent | 3c916fec12ab614aca5cf6ec09ae3adc6b911193 (diff) | |
| download | xhci-3d72210bdc1ef67b72ffbd3e74873cae7287f2c6.tar.gz | |
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>
| -rw-r--r-- | arch/um/include/shared/kern_util.h | 1 | ||||
| -rw-r--r-- | arch/um/sys-i386/signal.c | 2 | ||||
| -rw-r--r-- | arch/um/sys-x86_64/signal.c | 30 |
3 files changed, 1 insertions, 32 deletions
diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h index 3c341222d2525e..0f1483852460a2 100644 --- 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 4403b48ab044f5..b87195b92fccdb 100644 --- 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 ccfa5544e92c71..61ad980890c7d7 100644 --- 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) { |