diff options
author | Mark Brown <broonie@kernel.org> | 2014-10-06 17:33:17 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-10-06 17:33:17 +0100 |
commit | 0ee8bb9c4864ee826e6c669f230562cd0fed8722 (patch) | |
tree | 1ce9acff55fd979521cc0ca53cfc04659fbdce61 /arch/arm64/kernel/ptrace.c | |
parent | 54cd4bea5a18f7bd5921a76d31eef4c61a68d8e7 (diff) | |
parent | 926719debff484d9678a324c71e948b7dd60352b (diff) |
Merge tag 'v3.10.56' into linux-linaro-lsk
This is the 3.10.56 stable release
Diffstat (limited to 'arch/arm64/kernel/ptrace.c')
-rw-r--r-- | arch/arm64/kernel/ptrace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 096a7ad5f004..bc09a147454f 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -85,7 +85,8 @@ static void ptrace_hbptriggered(struct perf_event *bp, break; } } - for (i = ARM_MAX_BRP; i < ARM_MAX_HBP_SLOTS && !bp; ++i) { + + for (i = 0; i < ARM_MAX_WRP; ++i) { if (current->thread.debug.hbp_watch[i] == bp) { info.si_errno = -((i << 1) + 1); break; |