diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:05:19 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:14:59 -0400 |
commit | ab1c0cc7c96c17ea903ca6d3e42e7d2696b32b6c (patch) | |
tree | 9a72e06cab7b6dd293b16048d2928695c935ea46 /arch/um/os-Linux/signal.c | |
parent | 248b74c79ebb9fb55e146797a808836d90418c4b (diff) |
um: finish conversion to mcontext_t
now we don't mix host and guest signal frame layouts anymore; moreover,
we don't need host's struct sigcontext at all.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/os-Linux/signal.c')
-rw-r--r-- | arch/um/os-Linux/signal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index 07d9905e44ef..9f2c2228f7ae 100644 --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include "os.h" | 14 | #include "os.h" |
15 | #include "process.h" | 15 | #include "process.h" |
16 | #include "sysdep/barrier.h" | 16 | #include "sysdep/barrier.h" |
17 | #include "sysdep/sigcontext.h" | 17 | #include "sysdep/mcontext.h" |
18 | 18 | ||
19 | void (*sig_info[NSIG])(int, struct uml_pt_regs *) = { | 19 | void (*sig_info[NSIG])(int, struct uml_pt_regs *) = { |
20 | [SIGTRAP] = relay_signal, | 20 | [SIGTRAP] = relay_signal, |
@@ -34,7 +34,7 @@ static void sig_handler_common(int sig, mcontext_t *mc) | |||
34 | r.is_user = 0; | 34 | r.is_user = 0; |
35 | if (sig == SIGSEGV) { | 35 | if (sig == SIGSEGV) { |
36 | /* For segfaults, we want the data from the sigcontext. */ | 36 | /* For segfaults, we want the data from the sigcontext. */ |
37 | copy_sc(&r, (struct sigcontext *)mc); | 37 | get_regs_from_mc(&r, mc); |
38 | GET_FAULTINFO_FROM_MC(r.faultinfo, mc); | 38 | GET_FAULTINFO_FROM_MC(r.faultinfo, mc); |
39 | } | 39 | } |
40 | 40 | ||
@@ -84,7 +84,7 @@ static void real_alarm_handler(mcontext_t *mc) | |||
84 | struct uml_pt_regs regs; | 84 | struct uml_pt_regs regs; |
85 | 85 | ||
86 | if (mc != NULL) | 86 | if (mc != NULL) |
87 | copy_sc(®s, (struct sigcontext *)mc); | 87 | get_regs_from_mc(®s, mc); |
88 | regs.is_user = 0; | 88 | regs.is_user = 0; |
89 | unblock_signals(); | 89 | unblock_signals(); |
90 | timer_handler(SIGVTALRM, ®s); | 90 | timer_handler(SIGVTALRM, ®s); |