From: "Santos, Jose Renato G" <joserenato.santos@hp.com>

OProfile does not recognize Pentium D (Intel cpu model 6 for p4 family)
This prevents Oprofile from using hw performance counters on those CPUs
This patch enables Oprofile on those CPUs.

Signed-off-by: Jose Renato Santos <jsantos@hpl.hp.com>
Cc: Philippe Elie <phil.el@wanadoo.fr>
Cc: John Levon <levon@movementarian.org>
Cc: Andi Kleen <ak@muc.de>
Cc: Rohit Seth <rohitseth@google.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/oprofile/nmi_int.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/i386/oprofile/nmi_int.c~enable-oprofile-on-pentium-d arch/i386/oprofile/nmi_int.c
--- a/arch/i386/oprofile/nmi_int.c~enable-oprofile-on-pentium-d
+++ a/arch/i386/oprofile/nmi_int.c
@@ -331,7 +331,7 @@ static int __init p4_init(char ** cpu_ty
 {
 	__u8 cpu_model = boot_cpu_data.x86_model;
 
-	if (cpu_model > 4)
+	if ((cpu_model > 6) || (cpu_model == 5))
 		return 0;
 
 #ifndef CONFIG_SMP
_