diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-02 13:37:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-02 13:38:10 -0400 |
| commit | ec5e61aabeac58670691bd0613388d16697d0d81 (patch) | |
| tree | 59838509358f27334874b90756505785cde29b02 /arch/x86/include/asm/msr-index.h | |
| parent | 75ec5a245c7763c397f31ec8964d0a46c54a7386 (diff) | |
| parent | 8bb39f9aa068262732fe44b965d7a6eb5a5a7d67 (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
arch/x86/kernel/cpu/perf_event.c
Merge reason: Resolve the conflict, pick up fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/msr-index.h')
| -rw-r--r-- | arch/x86/include/asm/msr-index.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 06e4cf0d3846..bc473acfa7f9 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h | |||
| @@ -108,6 +108,8 @@ | |||
| 108 | #define MSR_AMD64_PATCH_LEVEL 0x0000008b | 108 | #define MSR_AMD64_PATCH_LEVEL 0x0000008b |
| 109 | #define MSR_AMD64_NB_CFG 0xc001001f | 109 | #define MSR_AMD64_NB_CFG 0xc001001f |
| 110 | #define MSR_AMD64_PATCH_LOADER 0xc0010020 | 110 | #define MSR_AMD64_PATCH_LOADER 0xc0010020 |
| 111 | #define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140 | ||
| 112 | #define MSR_AMD64_OSVW_STATUS 0xc0010141 | ||
| 111 | #define MSR_AMD64_IBSFETCHCTL 0xc0011030 | 113 | #define MSR_AMD64_IBSFETCHCTL 0xc0011030 |
| 112 | #define MSR_AMD64_IBSFETCHLINAD 0xc0011031 | 114 | #define MSR_AMD64_IBSFETCHLINAD 0xc0011031 |
| 113 | #define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 | 115 | #define MSR_AMD64_IBSFETCHPHYSAD 0xc0011032 |