]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
sh64: Fixup build breakage from breakpoint handler rename.
authorPaul Mundt <lethal@linux-sh.org>
Tue, 19 Jan 2010 06:58:27 +0000 (15:58 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 19 Jan 2010 06:58:27 +0000 (15:58 +0900)
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>
arch/sh/kernel/cpu/sh5/entry.S
arch/sh/kernel/ptrace_64.c

index 36d031c700bb8fd893b36f8c643797de1ad820d4..6b80295dd7a4bd5a612faf9001467c5be95c150d 100644 (file)
@@ -187,7 +187,7 @@ trap_jtable:
        .rept 6
                .long do_exception_error        /* 0x880 - 0x920 */
        .endr
-       .long   do_software_break_point /* 0x940 */
+       .long   breakpoint_trap_handler /* 0x940 */
        .long   do_exception_error              /* 0x960 */
        .long   do_single_step          /* 0x980 */
 
index 23fbd92a74e722e98a57af7f1b0823b94dad2b77..2f6140e95ec57c6c6827180d054b4e0adbde9c9e 100644 (file)
@@ -478,9 +478,10 @@ asmlinkage void do_single_step(unsigned long long vec, struct pt_regs *regs)
 }
 
 /* Called with interrupts disabled */
-asmlinkage void do_software_break_point(unsigned long long vec,
-                                       struct pt_regs *regs)
+BUILD_TRAP_HANDLER(breakpoint)
 {
+       TRAP_HANDLER_DECL;
+
        /* We need to forward step the PC, to counteract the backstep done
           in signal.c. */
        local_irq_enable();