From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jacob Shin <jacob.shin@amd.com>
Subject: [PATCH 1/3] xenoprof: Update cpu_type to sync with
	upstream oprofile
Date: Wed, 4 May 2011 20:09:01 -0500
Message-ID: <4DC1F8AD.3070504@amd.com>
References: <4DC1F53B.4050201@amd.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <4DC1F53B.4050201@amd.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User Jacob Shin <jacob.shin@amd.com>
# Date 1304461593 18000
# Node ID eeb1bb50ba13c36e44d4994e01d82d294f3c584a
# Parent  476b0d68e7d5405babc1182da3b345b1e4cc1bca
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 <jacob.shin@amd.com>

diff -r 476b0d68e7d5 -r eeb1bb50ba13 xen/arch/x86/oprofile/nmi_int.c
--- a/xen/arch/x86/oprofile/nmi_int.c	Sat Apr 30 09:48:16 2011 +0100
+++ b/xen/arch/x86/oprofile/nmi_int.c	Tue May 03 17:26:33 2011 -0500
@@ -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;