diff options
Diffstat (limited to 'arch/powerpc/kernel/kgdb.c')
-rw-r--r-- | arch/powerpc/kernel/kgdb.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c index 41bada0298c8..82a7b228c81a 100644 --- a/arch/powerpc/kernel/kgdb.c +++ b/arch/powerpc/kernel/kgdb.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/smp.h> | 20 | #include <linux/smp.h> |
21 | #include <linux/signal.h> | 21 | #include <linux/signal.h> |
22 | #include <linux/ptrace.h> | 22 | #include <linux/ptrace.h> |
23 | #include <linux/kdebug.h> | ||
23 | #include <asm/current.h> | 24 | #include <asm/current.h> |
24 | #include <asm/processor.h> | 25 | #include <asm/processor.h> |
25 | #include <asm/machdep.h> | 26 | #include <asm/machdep.h> |
@@ -115,7 +116,8 @@ void kgdb_roundup_cpus(unsigned long flags) | |||
115 | /* KGDB functions to use existing PowerPC64 hooks. */ | 116 | /* KGDB functions to use existing PowerPC64 hooks. */ |
116 | static int kgdb_debugger(struct pt_regs *regs) | 117 | static int kgdb_debugger(struct pt_regs *regs) |
117 | { | 118 | { |
118 | return kgdb_handle_exception(0, computeSignal(TRAP(regs)), 0, regs); | 119 | return !kgdb_handle_exception(1, computeSignal(TRAP(regs)), |
120 | DIE_OOPS, regs); | ||
119 | } | 121 | } |
120 | 122 | ||
121 | static int kgdb_handle_breakpoint(struct pt_regs *regs) | 123 | static int kgdb_handle_breakpoint(struct pt_regs *regs) |
@@ -123,7 +125,7 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs) | |||
123 | if (user_mode(regs)) | 125 | if (user_mode(regs)) |
124 | return 0; | 126 | return 0; |
125 | 127 | ||
126 | if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) | 128 | if (kgdb_handle_exception(1, SIGTRAP, 0, regs) != 0) |
127 | return 0; | 129 | return 0; |
128 | 130 | ||
129 | if (*(u32 *) (regs->nip) == *(u32 *) (&arch_kgdb_ops.gdb_bpt_instr)) | 131 | if (*(u32 *) (regs->nip) == *(u32 *) (&arch_kgdb_ops.gdb_bpt_instr)) |
@@ -309,6 +311,11 @@ void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs) | |||
309 | (unsigned long)(((void *)gdb_regs) + NUMREGBYTES)); | 311 | (unsigned long)(((void *)gdb_regs) + NUMREGBYTES)); |
310 | } | 312 | } |
311 | 313 | ||
314 | void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long pc) | ||
315 | { | ||
316 | regs->nip = pc; | ||
317 | } | ||
318 | |||
312 | /* | 319 | /* |
313 | * This function does PowerPC specific procesing for interfacing to gdb. | 320 | * This function does PowerPC specific procesing for interfacing to gdb. |
314 | */ | 321 | */ |