Lucid pull request, oprofile/x86: add Xeon 7500 series support

[Tim Gardner]

The following changes since commit 91a6b3ca66b3d7e089a32ee903447cceabbb76dc:
  Andi Kleen (1):
        [Upstream]: oprofile/x86: add Xeon 7500 series support

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-lucid.git xeon-oprofile


>From 91a6b3ca66b3d7e089a32ee903447cceabbb76dc Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi at firstfloor.org>
Date: Thu, 21 Jan 2010 23:26:27 +0100
Subject: [PATCH] [Upstream]: oprofile/x86: add Xeon 7500 series support

Add Xeon 7500 series support to oprofile.

https://lists.ubuntu.com/archives/kernel-team/2010-January/008547.html
Picked from git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git

Straight forward: it's the same as Core i7, so just detect
the model number. No user space changes needed.

Signed-off-by: Andi Kleen <ak at linux.intel.com>
Signed-off-by: Robert Richter <robert.richter at amd.com>
Signed-off-by: Tim Gardner <rtg at xps1330.(none)>
---
 arch/x86/oprofile/nmi_int.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index cb88b1a..5a14cd5 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -598,6 +598,7 @@ static int __init ppro_init(char **cpu_type)
 	case 15: case 23:
 		*cpu_type = "i386/core_2";
 		break;
+	case 0x2e:
 	case 26:
 		spec = &op_arch_perfmon_spec;
 		*cpu_type = "i386/core_i7";
-- 
1.6.2.4