diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-19 01:58:27 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-19 01:58:27 -0500 |
commit | a4ae2b2b18d1766768987dc5de42dfa3c2a6d9f7 (patch) | |
tree | e27fcec5e2422a9668ee59d4b5f6dc3b42bd1eeb | |
parent | d6db8888c8957fbdcd611e1321a6f6a0d6fb7e15 (diff) |
sh64: Fixup build breakage from breakpoint handler rename.
The breakpoint handler was renamed on sh32, but sh64 was overlooked in
the conversion. Fix it up now.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/kernel/cpu/sh5/entry.S | 2 | ||||
-rw-r--r-- | arch/sh/kernel/ptrace_64.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S index 36d031c700bb..6b80295dd7a4 100644 --- a/arch/sh/kernel/cpu/sh5/entry.S +++ b/arch/sh/kernel/cpu/sh5/entry.S | |||
@@ -187,7 +187,7 @@ trap_jtable: | |||
187 | .rept 6 | 187 | .rept 6 |
188 | .long do_exception_error /* 0x880 - 0x920 */ | 188 | .long do_exception_error /* 0x880 - 0x920 */ |
189 | .endr | 189 | .endr |
190 | .long do_software_break_point /* 0x940 */ | 190 | .long breakpoint_trap_handler /* 0x940 */ |
191 | .long do_exception_error /* 0x960 */ | 191 | .long do_exception_error /* 0x960 */ |
192 | .long do_single_step /* 0x980 */ | 192 | .long do_single_step /* 0x980 */ |
193 | 193 | ||
diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c index 23fbd92a74e7..2f6140e95ec5 100644 --- a/arch/sh/kernel/ptrace_64.c +++ b/arch/sh/kernel/ptrace_64.c | |||
@@ -478,9 +478,10 @@ asmlinkage void do_single_step(unsigned long long vec, struct pt_regs *regs) | |||
478 | } | 478 | } |
479 | 479 | ||
480 | /* Called with interrupts disabled */ | 480 | /* Called with interrupts disabled */ |
481 | asmlinkage void do_software_break_point(unsigned long long vec, | 481 | BUILD_TRAP_HANDLER(breakpoint) |
482 | struct pt_regs *regs) | ||
483 | { | 482 | { |
483 | TRAP_HANDLER_DECL; | ||
484 | |||
484 | /* We need to forward step the PC, to counteract the backstep done | 485 | /* We need to forward step the PC, to counteract the backstep done |
485 | in signal.c. */ | 486 | in signal.c. */ |
486 | local_irq_enable(); | 487 | local_irq_enable(); |