diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-27 04:46:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-27 04:46:19 -0400 |
| commit | 936c663aed930972f7e185485fd6c2da69e33819 (patch) | |
| tree | 41bb069f66e109fc63c4114a4390de44d3068356 /arch/arm/kernel | |
| parent | 072e5a1cfabca7276744d24726e094d85721df5c (diff) | |
| parent | 50f16a8bf9d7a92c437ed1867d0f7e1dc6a9aca9 (diff) | |
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) | |||
| 648 | * Per-cpu breakpoints are not supported by our stepping | 648 | * Per-cpu breakpoints are not supported by our stepping |
| 649 | * mechanism. | 649 | * mechanism. |
| 650 | */ | 650 | */ |
| 651 | if (!bp->hw.bp_target) | 651 | if (!bp->hw.target) |
| 652 | return -EINVAL; | 652 | return -EINVAL; |
| 653 | 653 | ||
| 654 | /* | 654 | /* |