diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-27 05:10:47 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-27 05:10:47 -0400 |
| commit | b381e63b48a0b6befc7b4e55408c39012a0dcf8c (patch) | |
| tree | 92e70447e1b0cf721ef40515db6b97cb881c5066 /arch/arm64 | |
| parent | 4e6d7c2aa95158315902647963b359b32da5c295 (diff) | |
| parent | ccd41c86ad4d464d0ed4e48d80759ff85c2115b0 (diff) | |
Merge branch 'perf/core' into perf/timer, before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/hw_breakpoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c index 98bbe06e469c..e7d934d3afe0 100644 --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c | |||
| @@ -527,7 +527,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) | |||
| 527 | * Disallow per-task kernel breakpoints since these would | 527 | * Disallow per-task kernel breakpoints since these would |
| 528 | * complicate the stepping code. | 528 | * complicate the stepping code. |
| 529 | */ | 529 | */ |
| 530 | if (info->ctrl.privilege == AARCH64_BREAKPOINT_EL1 && bp->hw.bp_target) | 530 | if (info->ctrl.privilege == AARCH64_BREAKPOINT_EL1 && bp->hw.target) |
| 531 | return -EINVAL; | 531 | return -EINVAL; |
| 532 | 532 | ||
| 533 | return 0; | 533 | return 0; |