References: FATE#309893, FATE#309902, FATE#309903, FATE#309906 # HG changeset patch # User Jacob Shin # Date 1304930954 -3600 # Node ID 8981b582be3e2f6647ef5ff3d93e167436ed357a # Parent 82180954eda9cfe279e7ecf8c9ed4ffa29796bfb xenoprof: Update cpu_type to sync with upstream oprofile Update xenoprof's cpu_type to match upstream oprofile. Currently AMD Family 11h ~ Family 15h are broken due to string mismatches. Signed-off-by: Jacob Shin Index: xen-4.1.1-testing/xen/arch/x86/oprofile/nmi_int.c =================================================================== --- xen-4.1.1-testing.orig/xen/arch/x86/oprofile/nmi_int.c +++ xen-4.1.1-testing/xen/arch/x86/oprofile/nmi_int.c @@ -435,19 +435,19 @@ static int __init nmi_init(void) break; case 0x11: model = &op_athlon_spec; - cpu_type = "x86-64/family11"; + cpu_type = "x86-64/family11h"; break; case 0x12: model = &op_athlon_spec; - cpu_type = "x86-64/family12"; + cpu_type = "x86-64/family12h"; break; case 0x14: model = &op_athlon_spec; - cpu_type = "x86-64/family14"; + cpu_type = "x86-64/family14h"; break; case 0x15: model = &op_athlon_spec; - cpu_type = "x86-64/family15"; + cpu_type = "x86-64/family15h"; break; } break;