diff options
-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 3c341222d25..0f148385246 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); | |||
21 | extern void free_stack(unsigned long stack, int order); | 21 | extern void free_stack(unsigned long stack, int order); |
22 | 22 | ||
23 | extern int do_signal(void); | 23 | extern int do_signal(void); |
24 | extern void copy_sc(struct uml_pt_regs *regs, void *from); | ||
25 | extern void interrupt_end(void); | 24 | extern void interrupt_end(void); |
26 | extern void relay_signal(int sig, struct uml_pt_regs *regs); | 25 | extern void relay_signal(int sig, struct uml_pt_regs *regs); |
27 | 26 | ||
diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c index 4403b48ab04..b87195b92fc 100644 --- a/arch/um/sys-i386/signal.c +++ b/arch/um/sys-i386/signal.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include "frame_kern.h" | 10 | #include "frame_kern.h" |
11 | #include "skas.h" | 11 | #include "skas.h" |
12 | 12 | ||
13 | void copy_sc(struct uml_pt_regs *regs, void *from) | 13 | static void copy_sc(struct uml_pt_regs *regs, void *from) |
14 | { | 14 | { |
15 | struct sigcontext *sc = from; | 15 | struct sigcontext *sc = from; |
16 | 16 | ||
diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c index ccfa5544e92..61ad980890c 100644 --- a/arch/um/sys-x86_64/signal.c +++ b/arch/um/sys-x86_64/signal.c | |||
@@ -13,36 +13,6 @@ | |||
13 | #include "frame_kern.h" | 13 | #include "frame_kern.h" |
14 | #include "skas.h" | 14 | #include "skas.h" |
15 | 15 | ||
16 | void copy_sc(struct uml_pt_regs *regs, void *from) | ||
17 | { | ||
18 | struct sigcontext *sc = from; | ||
19 | |||
20 | #define GETREG(regs, regno, sc, regname) \ | ||
21 | (regs)->gp[(regno) / sizeof(unsigned long)] = (sc)->regname | ||
22 | |||
23 | GETREG(regs, R8, sc, r8); | ||
24 | GETREG(regs, R9, sc, r9); | ||
25 | GETREG(regs, R10, sc, r10); | ||
26 | GETREG(regs, R11, sc, r11); | ||
27 | GETREG(regs, R12, sc, r12); | ||
28 | GETREG(regs, R13, sc, r13); | ||
29 | GETREG(regs, R14, sc, r14); | ||
30 | GETREG(regs, R15, sc, r15); | ||
31 | GETREG(regs, RDI, sc, di); | ||
32 | GETREG(regs, RSI, sc, si); | ||
33 | GETREG(regs, RBP, sc, bp); | ||
34 | GETREG(regs, RBX, sc, bx); | ||
35 | GETREG(regs, RDX, sc, dx); | ||
36 | GETREG(regs, RAX, sc, ax); | ||
37 | GETREG(regs, RCX, sc, cx); | ||
38 | GETREG(regs, RSP, sc, sp); | ||
39 | GETREG(regs, RIP, sc, ip); | ||
40 | GETREG(regs, EFLAGS, sc, flags); | ||
41 | GETREG(regs, CS, sc, cs); | ||
42 | |||
43 | #undef GETREG | ||
44 | } | ||
45 | |||
46 | static int copy_sc_from_user(struct pt_regs *regs, | 16 | static int copy_sc_from_user(struct pt_regs *regs, |
47 | struct sigcontext __user *from) | 17 | struct sigcontext __user *from) |
48 | { | 18 | { |