- enable-oprofile-on-pentium-d.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     Enable OProfile on Pentium D

has been removed from the -mm tree.  Its filename is

     enable-oprofile-on-pentium-d.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: Enable OProfile on Pentium D
From: "Santos, Jose Renato G" <joserenato.santos@xxxxxx>

At initialization Oprofile checks if the cpu model returned by the CPUID
instruction is a valid one.  For Intel p4 family this is done at p4_init() in
arch/i386/oprofile/nmi_int.c.

The problem is that Oprofile returns 0 (initialization failure) if the CPU
model is greater than 4, i.e it only recognizes CPU models 0,1,2,3 and 4.  The
CPUID instruction on pentium D family 900 returns 6 for the CPU model .  This
prevents Oprofile to use HW performance counters (since it does not know that
CPU model) and falls back to timer mode.

The patch adds the CPU model 6 as a valid CPU model for Intel P4 family.

Signed-off-by: Jose Renato Santos <jsantos@xxxxxxxxxx>
Cc: Philippe Elie <phil.el@xxxxxxxxxx>
Cc: John Levon <levon@xxxxxxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Rohit Seth <rohitseth@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 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
_

Patches currently in -mm which might be from joserenato.santos@xxxxxx are


-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux