1 files changed, 26 insertions, 30 deletions

diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index b2258ca91003..95b89d4cb8f1 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -47,20 +47,8 @@
 #include <asm/debugreg.h>
 #include <asm/apicdef.h>
 #include <asm/system.h>
-
 #include <asm/apic.h>
 
-/*
- * Put the error code here just in case the user cares:
- */
-static int gdb_x86errcode;
-
-/*
- * Likewise, the vector number here (since GDB only gets the signal
- * number through the usual means, and that's not very specific):
- */
-static int gdb_x86vector = -1;
-
 /**
  *      pt_regs_to_gdb_regs - Convert ptrace regs to GDB regs
  *      @gdb_regs: A pointer to hold the registers in the order GDB wants.
@@ -399,23 +387,6 @@ void kgdb_disable_hw_debug(struct pt_regs *regs)
         }
 }
 
-/**
- *      kgdb_post_primary_code - Save error vector/code numbers.
- *      @regs: Original pt_regs.
- *      @e_vector: Original error vector.
- *      @err_code: Original error code.
- *
- *      This is needed on architectures which support SMP and KGDB.
- *      This function is called after all the slave cpus have been put
- *      to a know spin state and the primary CPU has control over KGDB.
- */
-void kgdb_post_primary_code(struct pt_regs *regs, int e_vector, int err_code)
-{
-        /* primary processor is completely in the debugger */
-        gdb_x86vector = e_vector;
-        gdb_x86errcode = err_code;
-}
-
 #ifdef CONFIG_SMP
 /**
  *      kgdb_roundup_cpus - Get other CPUs into a holding pattern
@@ -567,7 +538,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
                         return NOTIFY_DONE;
         }
 
-        if (kgdb_handle_exception(args->trapnr, args->signr, args->err, regs))
+        if (kgdb_handle_exception(args->trapnr, args->signr, cmd, regs))
                 return NOTIFY_DONE;
 
         /* Must touch watchdog before return to normal operation */
@@ -575,6 +546,26 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
         return NOTIFY_STOP;
 }
 
+#ifdef CONFIG_KGDB_LOW_LEVEL_TRAP
+int kgdb_ll_trap(int cmd, const char *str,
+                 struct pt_regs *regs, long err, int trap, int sig)
+{
+        struct die_args args = {
+                .regs   = regs,
+                .str    = str,
+                .err    = err,
+                .trapnr = trap,
+                .signr  = sig,
+
+        };
+
+        if (!kgdb_io_module_registered)
+                return NOTIFY_DONE;
+
+        return __kgdb_notify(&args, cmd);
+}
+#endif /* CONFIG_KGDB_LOW_LEVEL_TRAP */
+
 static int
 kgdb_notify(struct notifier_block *self, unsigned long cmd, void *ptr)
 {
@@ -690,6 +681,11 @@ unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs)
         return instruction_pointer(regs);
 }
 
+void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)
+{
+        regs->ip = ip;
+}
+
 struct kgdb_arch arch_kgdb_ops = {
         /* Breakpoint instruction: */
         .gdb_bpt_instr          = { 0xcc },