diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-28 15:48:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-28 15:48:59 +0100 |
| commit | b3890e4704594fa23abe1395d1fafc97d3214be8 (patch) | |
| tree | 23e2659713e01779e8854363eb7d1fac49683d32 /arch/x86/include/asm/hw_breakpoint.h | |
| parent | 29bf4dbc9841366577ba44175b00c543ad1712d6 (diff) | |
| parent | 2a2662bf88e693d477ef08351d03934f7bc0b51c (diff) | |
Merge branch 'perf/hw_breakpoints' into perf/core
The new hw_breakpoint bits are now ready for v3.20, merge them
into the main branch, to avoid conflicts.
Conflicts:
tools/perf/Documentation/perf-record.txt
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/hw_breakpoint.h')
| -rw-r--r-- | arch/x86/include/asm/hw_breakpoint.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/hw_breakpoint.h b/arch/x86/include/asm/hw_breakpoint.h index ef1c4d2d41ec..6c98be864a75 100644 --- a/arch/x86/include/asm/hw_breakpoint.h +++ b/arch/x86/include/asm/hw_breakpoint.h @@ -12,6 +12,7 @@ */ struct arch_hw_breakpoint { unsigned long address; + unsigned long mask; u8 len; u8 type; }; |