diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-30 11:26:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-30 11:26:45 +0100 |
| commit | 56f4c400349157289b474a3fd49ee96acab0a4d7 (patch) | |
| tree | fe6fa38a2e4b87f301da7145cf01cd64df47e9ec /arch/x86/include | |
| parent | 32ae2ade462146729580117d9886cc9efd83dfbe (diff) | |
| parent | da169f5df2764a6a937cb3b07562e269edfb1c0e (diff) | |
| download | blackbird-op-linux-56f4c400349157289b474a3fd49ee96acab0a4d7.tar.gz blackbird-op-linux-56f4c400349157289b474a3fd49ee96acab0a4d7.zip | |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/msr-index.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 6b89f5e86021..86030f63ba02 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -123,6 +123,10 @@ #define MSR_AMD64_IBSCTL 0xc001103a #define MSR_AMD64_IBSBRTARGET 0xc001103b +/* Fam 15h MSRs */ +#define MSR_F15H_PERF_CTL 0xc0010200 +#define MSR_F15H_PERF_CTR 0xc0010201 + /* Fam 10h MSRs */ #define MSR_FAM10H_MMIO_CONF_BASE 0xc0010058 #define FAM10H_MMIO_CONF_ENABLE (1<<0) |
