Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux

[linux-2.6-block.git] / arch / arm / kernel / hw_breakpoint.c

diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
index 93f9034e4e72dee6eb9cdea7ceb0532f0722a514..a12efd0f43e81a173a532d09f15e79b3bcf0cebd 100644 (file)
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
@@ -627,7 +627,7 @@ int hw_breakpoint_arch_parse(struct perf_event *bp,
        hw->address &= ~alignment_mask;
        hw->ctrl.len <<= offset;
 
-       if (uses_default_overflow_handler(bp)) {
+       if (is_default_overflow_handler(bp)) {
                /*
                 * Mismatch breakpoints are required for single-stepping
                 * breakpoints.
@@ -799,7 +799,7 @@ static void watchpoint_handler(unsigned long addr, unsigned int fsr,
                 * Otherwise, insert a temporary mismatch breakpoint so that
                 * we can single-step over the watchpoint trigger.
                 */
-               if (!uses_default_overflow_handler(wp))
+               if (!is_default_overflow_handler(wp))
                        continue;
 step:
                enable_single_step(wp, instruction_pointer(regs));
@@ -812,7 +812,7 @@ step:
                info->trigger = addr;
                pr_debug("watchpoint fired: address = 0x%x\n", info->trigger);
                perf_bp_event(wp, regs);
-               if (uses_default_overflow_handler(wp))
+               if (is_default_overflow_handler(wp))
                        enable_single_step(wp, instruction_pointer(regs));
        }
 
@@ -887,7 +887,7 @@ static void breakpoint_handler(unsigned long unknown, struct pt_regs *regs)
                        info->trigger = addr;
                        pr_debug("breakpoint fired: address = 0x%x\n", addr);
                        perf_bp_event(bp, regs);
-                       if (uses_default_overflow_handler(bp))
+                       if (is_default_overflow_handler(bp))
                                enable_single_step(bp, addr);
                        goto unlock;
                }