diff options
| -rw-r--r-- | xen/arch/x86/hvm/svm/vpmu.c | 2 | ||||
| -rw-r--r-- | xen/arch/x86/oprofile/nmi_int.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/hvm/svm/vpmu.c index 96eee8c27a..bf186fea3d 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/hvm/svm/vpmu.c @@ -314,6 +314,7 @@ static int amd_vpmu_initialise(struct vcpu *v) case 0x10: case 0x12: case 0x14: + case 0x16: default: num_counters = F10H_NUM_COUNTERS; counters = AMD_F10H_COUNTERS; @@ -375,6 +376,7 @@ int svm_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) case 0x12: case 0x14: case 0x15: + case 0x16: ret = amd_vpmu_initialise(v); if ( !ret ) vpmu->arch_vpmu_ops = &amd_vpmu_ops; diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c index 0710db2708..c824b84eaf 100644 --- a/xen/arch/x86/oprofile/nmi_int.c +++ b/xen/arch/x86/oprofile/nmi_int.c @@ -415,6 +415,10 @@ static int __init nmi_init(void) model = &op_amd_fam15h_spec; cpu_type = "x86-64/family15h"; break; + case 0x16: + model = &op_athlon_spec; + cpu_type = "x86-64/family16h"; + break; } break; |