diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-28 14:48:59 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-28 14:48:59 (GMT) |
| commit | b3890e4704594fa23abe1395d1fafc97d3214be8 (patch) | |
| tree | 23e2659713e01779e8854363eb7d1fac49683d32 /arch/x86/include/uapi/asm/msr-index.h | |
| parent | 29bf4dbc9841366577ba44175b00c543ad1712d6 (diff) | |
| parent | 2a2662bf88e693d477ef08351d03934f7bc0b51c (diff) | |
| download | linux-b3890e4704594fa23abe1395d1fafc97d3214be8.tar.xz | |
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/uapi/asm/msr-index.h')
| -rw-r--r-- | arch/x86/include/uapi/asm/msr-index.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h index c8aa65d..d979e5a 100644 --- a/arch/x86/include/uapi/asm/msr-index.h +++ b/arch/x86/include/uapi/asm/msr-index.h @@ -251,6 +251,10 @@ /* Fam 16h MSRs */ #define MSR_F16H_L2I_PERF_CTL 0xc0010230 #define MSR_F16H_L2I_PERF_CTR 0xc0010231 +#define MSR_F16H_DR1_ADDR_MASK 0xc0011019 +#define MSR_F16H_DR2_ADDR_MASK 0xc001101a +#define MSR_F16H_DR3_ADDR_MASK 0xc001101b +#define MSR_F16H_DR0_ADDR_MASK 0xc0011027 /* Fam 15h MSRs */ #define MSR_F15H_PERF_CTL 0xc0010200 |