diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-03-27 09:46:19 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-03-27 09:46:19 +0100 |
commit | 936c663aed930972f7e185485fd6c2da69e33819 (patch) | |
tree | 41bb069f66e109fc63c4114a4390de44d3068356 /arch/arm64/kernel/hw_breakpoint.c | |
parent | 072e5a1cfabca7276744d24726e094d85721df5c (diff) | |
parent | 50f16a8bf9d7a92c437ed1867d0f7e1dc6a9aca9 (diff) | |
download | linux-stable-936c663aed930972f7e185485fd6c2da69e33819.tar.gz linux-stable-936c663aed930972f7e185485fd6c2da69e33819.tar.bz2 linux-stable-936c663aed930972f7e185485fd6c2da69e33819.zip |
Merge branch 'perf/x86' into perf/core, because it's ready
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/hw_breakpoint.c')
-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) * Disallow per-task kernel breakpoints since these would * complicate the stepping code. */ - if (info->ctrl.privilege == AARCH64_BREAKPOINT_EL1 && bp->hw.bp_target) + if (info->ctrl.privilege == AARCH64_BREAKPOINT_EL1 && bp->hw.target) return -EINVAL; return 0; |