From 9613a2ee280f4913c72025d83cbef472fab5cc5f Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 18 Oct 2012 15:17:00 +0100 Subject: [PATCH] --- yaml --- r: 334673 b: refs/heads/master c: 8f34a1da35aed7b438a2de8ac27723a5472e8399 h: refs/heads/master i: 334671: f36d8229fd3ad1b949830b3b144a88abd1ca23b0 v: v3 --- [refs] | 2 +- trunk/arch/arm64/kernel/ptrace.c | 37 ++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 69fee317330d..3dc3dce9eb7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7797d17c591ae62c6f43c6de4fdb8beeb50eb692 +refs/heads/master: 8f34a1da35aed7b438a2de8ac27723a5472e8399 diff --git a/trunk/arch/arm64/kernel/ptrace.c b/trunk/arch/arm64/kernel/ptrace.c index c62d39d5c99f..6e1e77f1831c 100644 --- a/trunk/arch/arm64/kernel/ptrace.c +++ b/trunk/arch/arm64/kernel/ptrace.c @@ -234,28 +234,33 @@ static int ptrace_hbp_fill_attr_ctrl(unsigned int note_type, struct arch_hw_breakpoint_ctrl ctrl, struct perf_event_attr *attr) { - int err, len, type; + int err, len, type, disabled = !ctrl.enabled; - err = arch_bp_generic_fields(ctrl, &len, &type); - if (err) - return err; - - switch (note_type) { - case NT_ARM_HW_BREAK: - if ((type & HW_BREAKPOINT_X) != type) - return -EINVAL; - break; - case NT_ARM_HW_WATCH: - if ((type & HW_BREAKPOINT_RW) != type) + if (disabled) { + len = 0; + type = HW_BREAKPOINT_EMPTY; + } else { + err = arch_bp_generic_fields(ctrl, &len, &type); + if (err) + return err; + + switch (note_type) { + case NT_ARM_HW_BREAK: + if ((type & HW_BREAKPOINT_X) != type) + return -EINVAL; + break; + case NT_ARM_HW_WATCH: + if ((type & HW_BREAKPOINT_RW) != type) + return -EINVAL; + break; + default: return -EINVAL; - break; - default: - return -EINVAL; + } } attr->bp_len = len; attr->bp_type = type; - attr->disabled = !ctrl.enabled; + attr->disabled = disabled; return 0; }