diff options
author | Jeff Dike <jdike@addtoit.com> | 2008-02-05 01:31:12 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:30 -0500 |
commit | 75ada8ffe08cef9b506a796ba6f9ce2071dcf0d7 (patch) | |
tree | ee7702a687fc3857f8c5190bca4f7c5f3c1497d2 /arch/um/os-Linux/signal.c | |
parent | e06173bde0ec9830a296720f8cd7cb2f17b76fa4 (diff) |
uml: move sig_handler_common_skas
This patch moves sig_handler_common_skas from
arch/um/os-Linux/skas/trap.c to its only caller in
arch/um/os-Linux/signal.c. trap.c is now empty, so it can be removed.
This is code movement only - the significant cleanup needed here is
done in the next patch.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/os-Linux/signal.c')
-rw-r--r-- | arch/um/os-Linux/signal.c | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index 62a66f38a913..cde9e766b5b4 100644 --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c | |||
@@ -9,12 +9,74 @@ | |||
9 | #include <errno.h> | 9 | #include <errno.h> |
10 | #include <signal.h> | 10 | #include <signal.h> |
11 | #include <strings.h> | 11 | #include <strings.h> |
12 | #include "as-layout.h" | ||
13 | #include "kern_constants.h" | ||
12 | #include "kern_util.h" | 14 | #include "kern_util.h" |
13 | #include "os.h" | 15 | #include "os.h" |
14 | #include "sysdep/barrier.h" | 16 | #include "sysdep/barrier.h" |
15 | #include "sysdep/sigcontext.h" | 17 | #include "sysdep/sigcontext.h" |
18 | #include "task.h" | ||
16 | #include "user.h" | 19 | #include "user.h" |
17 | 20 | ||
21 | void (*sig_info[NSIG])(int, struct uml_pt_regs *) = { | ||
22 | [SIGTRAP] = relay_signal, | ||
23 | [SIGFPE] = relay_signal, | ||
24 | [SIGILL] = relay_signal, | ||
25 | [SIGWINCH] = winch, | ||
26 | [SIGBUS] = bus_handler, | ||
27 | [SIGSEGV] = segv_handler, | ||
28 | [SIGIO] = sigio_handler, | ||
29 | [SIGVTALRM] = timer_handler }; | ||
30 | |||
31 | static struct uml_pt_regs ksig_regs[UM_NR_CPUS]; | ||
32 | |||
33 | void sig_handler_common_skas(int sig, void *sc_ptr) | ||
34 | { | ||
35 | struct sigcontext *sc = sc_ptr; | ||
36 | struct uml_pt_regs *r; | ||
37 | void (*handler)(int, struct uml_pt_regs *); | ||
38 | int save_user, save_errno = errno; | ||
39 | |||
40 | /* | ||
41 | * This is done because to allow SIGSEGV to be delivered inside a SEGV | ||
42 | * handler. This can happen in copy_user, and if SEGV is disabled, | ||
43 | * the process will die. | ||
44 | * XXX Figure out why this is better than SA_NODEFER | ||
45 | */ | ||
46 | if (sig == SIGSEGV) { | ||
47 | change_sig(SIGSEGV, 1); | ||
48 | /* | ||
49 | * For segfaults, we want the data from the | ||
50 | * sigcontext. In this case, we don't want to mangle | ||
51 | * the process registers, so use a static set of | ||
52 | * registers. For other signals, the process | ||
53 | * registers are OK. | ||
54 | */ | ||
55 | r = &ksig_regs[cpu()]; | ||
56 | copy_sc(r, sc_ptr); | ||
57 | } else | ||
58 | r = TASK_REGS(get_current()); | ||
59 | |||
60 | save_user = r->is_user; | ||
61 | r->is_user = 0; | ||
62 | if ((sig == SIGFPE) || (sig == SIGSEGV) || (sig == SIGBUS) || | ||
63 | (sig == SIGILL) || (sig == SIGTRAP)) | ||
64 | GET_FAULTINFO_FROM_SC(r->faultinfo, sc); | ||
65 | |||
66 | change_sig(SIGUSR1, 1); | ||
67 | |||
68 | handler = sig_info[sig]; | ||
69 | |||
70 | /* unblock SIGVTALRM, SIGIO if sig isn't IRQ signal */ | ||
71 | if ((sig != SIGIO) && (sig != SIGWINCH) && (sig != SIGVTALRM)) | ||
72 | unblock_signals(); | ||
73 | |||
74 | handler(sig, r); | ||
75 | |||
76 | errno = save_errno; | ||
77 | r->is_user = save_user; | ||
78 | } | ||
79 | |||
18 | /* Copied from linux/compiler-gcc.h since we can't include it directly */ | 80 | /* Copied from linux/compiler-gcc.h since we can't include it directly */ |
19 | #define barrier() __asm__ __volatile__("": : :"memory") | 81 | #define barrier() __asm__ __volatile__("": : :"memory") |
20 | 82 | ||