From 862b26df3d6da53855b0c0d5ab9c0b91039e9708 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Wed, 1 Dec 2010 17:05:24 +0000 Subject: [PATCH] --- yaml --- r: 225927 b: refs/heads/master c: 3ce70b2e24cd35cc9f2df8cf5205b8ab4e6178e1 h: refs/heads/master i: 225925: 68cd54b0a98ff6df2641920328f92d02a2990131 225923: b2ee34ccae5a3c24cc86c2d0b03a2986b6b4579b 225919: 03043f647004ed376a0fc21176af023b88d31c1b v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/hw_breakpoint.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c46c3904d5a0..7de4058a6890 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ebb3cbcc39d4e61ae6751167086acfb5c201e6f +refs/heads/master: 3ce70b2e24cd35cc9f2df8cf5205b8ab4e6178e1 diff --git a/trunk/arch/arm/kernel/hw_breakpoint.c b/trunk/arch/arm/kernel/hw_breakpoint.c index 36cd7680d3d2..eef1b1e235a7 100644 --- a/trunk/arch/arm/kernel/hw_breakpoint.c +++ b/trunk/arch/arm/kernel/hw_breakpoint.c @@ -622,10 +622,12 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) * Currently we rely on an overflow handler to take * care of single-stepping the breakpoint when it fires. * In the case of userspace breakpoints on a core with V7 debug, - * we can use the mismatch feature as a poor-man's hardware single-step. + * we can use the mismatch feature as a poor-man's hardware + * single-step, but this only works for per-task breakpoints. */ if (WARN_ONCE(!bp->overflow_handler && - (arch_check_bp_in_kernelspace(bp) || !core_has_mismatch_brps()), + (arch_check_bp_in_kernelspace(bp) || !core_has_mismatch_brps() + || !bp->hw.bp_target), "overflow handler required but none found")) { ret = -EINVAL; }