uml: stop gdb from deleting breakpoints when running UML

[linux-2.6-omap-h63xx.git] / arch / um / os-Linux / trap.c

diff --git a/arch/um/os-Linux/trap.c b/arch/um/os-Linux/trap.c
index d221214d2ed543d1bf6ad9d4462d0ba7b907dfea..2a1c9843e32e0e298868f0e971bd85cc08b45751 100644 (file)
--- a/arch/um/os-Linux/trap.c
+++ b/arch/um/os-Linux/trap.c
@@ -1,23 +1,14 @@
 /*
- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include <stdlib.h>
 #include <signal.h>
-#include "kern_util.h"
-#include "user_util.h"
 #include "os.h"
-#include "mode.h"
-#include "longjmp.h"
-
-void usr2_handler(int sig, union uml_pt_regs *regs)
-{
-       CHOOSE_MODE(syscall_handler_tt(sig, regs), (void) 0);
-}
+#include "sysdep/ptrace.h"
 
 /* Initialized from linux_main() */
-void (*sig_info[NSIG])(int, union uml_pt_regs *);
+void (*sig_info[NSIG])(int, struct uml_pt_regs *);
 
 void os_fill_handlinfo(struct kern_handlers h)
 {
@@ -29,13 +20,4 @@ void os_fill_handlinfo(struct kern_handlers h)
        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)
-{
-       jmp_buf *buf = b;
-
-       UML_LONGJMP(buf, val);
 }