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/arm/kernel | |
parent | Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh th... (diff) | |
parent | perf: Remove type specific target pointers (diff) | |
download | linux-936c663aed930972f7e185485fd6c2da69e33819.tar.xz linux-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/arm/kernel')
-rw-r--r-- | arch/arm/kernel/hw_breakpoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c index 7fc70ae21185..dc7d0a95bd36 100644 --- a/arch/arm/kernel/hw_breakpoint.c +++ b/arch/arm/kernel/hw_breakpoint.c @@ -648,7 +648,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) * Per-cpu breakpoints are not supported by our stepping * mechanism. */ - if (!bp->hw.bp_target) + if (!bp->hw.target) return -EINVAL; /* |