projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[linux-drm-fsl-dcu.git]
/
arch
/
um
/
os-Linux
/
trap.c
diff --git
a/arch/um/os-Linux/trap.c
b/arch/um/os-Linux/trap.c
index 1df231a26244b0ee3e95982e98e3946a60fc51e3..295da657931ab54fef6d3f1cb308cf002f0454f7 100644
(file)
--- a/
arch/um/os-Linux/trap.c
+++ b/
arch/um/os-Linux/trap.c
@@
-6,7
+6,6
@@
#include <stdlib.h>
#include <signal.h>
#include "kern_util.h"
#include <stdlib.h>
#include <signal.h>
#include "kern_util.h"
-#include "user_util.h"
#include "os.h"
#include "mode.h"
#include "longjmp.h"
#include "os.h"
#include "mode.h"
#include "longjmp.h"
@@
-16,6
+15,7
@@
void usr2_handler(int sig, union uml_pt_regs *regs)
CHOOSE_MODE(syscall_handler_tt(sig, regs), (void) 0);
}
CHOOSE_MODE(syscall_handler_tt(sig, regs), (void) 0);
}
+/* Initialized from linux_main() */
void (*sig_info[NSIG])(int, union uml_pt_regs *);
void os_fill_handlinfo(struct kern_handlers h)
void (*sig_info[NSIG])(int, union uml_pt_regs *);
void os_fill_handlinfo(struct kern_handlers h)