1 files changed, 18 insertions, 15 deletions

diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index cb3321f8e0a9..44e490419495 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -13,6 +13,7 @@
 #include "as-layout.h"
 #include "kern_util.h"
 #include "os.h"
+#include "skas.h"
 #include "sysdep/sigcontext.h"
 
 /*
@@ -128,7 +129,19 @@ static void bad_segv(struct faultinfo fi, unsigned long ip)
         force_sig_info(SIGSEGV, &si, current);
 }
 
-static void segv_handler(int sig, struct uml_pt_regs *regs)
+void fatal_sigsegv(void)
+{
+        force_sigsegv(SIGSEGV, current);
+        do_signal();
+        /*
+         * This is to tell gcc that we're not returning - do_signal
+         * can, in general, return, but in this case, it's not, since
+         * we just got a fatal SIGSEGV queued.
+         */
+        os_dump_core();
+}
+
+void segv_handler(int sig, struct uml_pt_regs *regs)
 {
         struct faultinfo * fi = UPT_FAULTINFO(regs);
 
@@ -216,9 +229,6 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
 
 void relay_signal(int sig, struct uml_pt_regs *regs)
 {
-        if (arch_handle_signal(sig, regs))
-                return;
-
         if (!UPT_IS_USER(regs)) {
                 if (sig == SIGBUS)
                         printk(KERN_ERR "Bus error - the host /dev/shm or /tmp "
@@ -226,31 +236,24 @@ void relay_signal(int sig, struct uml_pt_regs *regs)
                 panic("Kernel mode signal %d", sig);
         }
 
+        arch_examine_signal(sig, regs);
+
         current->thread.arch.faultinfo = *UPT_FAULTINFO(regs);
         force_sig(sig, current);
 }
 
-static void bus_handler(int sig, struct uml_pt_regs *regs)
+void bus_handler(int sig, struct uml_pt_regs *regs)
 {
         if (current->thread.fault_catcher != NULL)
                 UML_LONGJMP(current->thread.fault_catcher, 1);
         else relay_signal(sig, regs);
 }
 
-static void winch(int sig, struct uml_pt_regs *regs)
+void winch(int sig, struct uml_pt_regs *regs)
 {
         do_IRQ(WINCH_IRQ, regs);
 }
 
-const struct kern_handlers handlinfo_kern = {
-        .relay_signal = relay_signal,
-        .winch = winch,
-        .bus_handler = bus_handler,
-        .page_fault = segv_handler,
-        .sigio_handler = sigio_handler,
-        .timer_handler = timer_handler
-};
-
 void trap_init(void)
 {
 }