[PATCH] uml: merge trap_user.c and trap_kern.c
The serial UML OS-abstraction layer patch (um/kernel dir). This joins trap_user.c and trap_kernel.c files. Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com> Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
ea2ba7dc3d
commit
c66fdd5e32
@@ -3,11 +3,34 @@
|
||||
* Licensed under the GPL
|
||||
*/
|
||||
|
||||
#include <setjmp.h>
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
#include <setjmp.h>
|
||||
#include "kern_util.h"
|
||||
#include "user_util.h"
|
||||
#include "os.h"
|
||||
#include "mode.h"
|
||||
|
||||
void usr2_handler(int sig, union uml_pt_regs *regs)
|
||||
{
|
||||
CHOOSE_MODE(syscall_handler_tt(sig, regs), (void) 0);
|
||||
}
|
||||
|
||||
void (*sig_info[NSIG])(int, union uml_pt_regs *);
|
||||
|
||||
void os_fill_handlinfo(struct kern_handlers h)
|
||||
{
|
||||
sig_info[SIGTRAP] = h.relay_signal;
|
||||
sig_info[SIGFPE] = h.relay_signal;
|
||||
sig_info[SIGILL] = h.relay_signal;
|
||||
sig_info[SIGWINCH] = h.winch;
|
||||
sig_info[SIGBUS] = h.bus_handler;
|
||||
sig_info[SIGSEGV] = h.page_fault;
|
||||
sig_info[SIGIO] = h.sigio_handler;
|
||||
sig_info[SIGVTALRM] = h.timer_handler;
|
||||
sig_info[SIGALRM] = h.timer_handler;
|
||||
sig_info[SIGUSR2] = usr2_handler;
|
||||
}
|
||||
|
||||
void do_longjmp(void *b, int val)
|
||||
{
|
||||
|
Reference in New Issue
Block a user