* Ingo Molnar <[EMAIL PROTECTED]> wrote:
> > > # Directories & files removed with 'make mrproper'
> > > -MRPROPER_DIRS += include/config include2 usr/include
> > > +MRPROPER_DIRS += include/config include2 usr/include arch/i386
> > > arch/x86_64
> > sigh - arch specific stuff in the top-level Makefile.
> > This really belongs in arch/x86/Makefile
>
> is this a NACK? Can clean this up in v2.6.25, but this seemed the only
> simple solution for v2.6.24.
ok, since it's admittedly ugly, and all we have in arch/i386/kernel/boot
is a symbolic link, i've removed that commit from the .24 updates
portion of x86.git.
Linus, could you please pull this single fix instead:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
Arjan van de Ven (1):
x86: add support for the latest Intel processors to Oprofile
nmi_int.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 2d0eeac..944bbcd 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -380,7 +380,7 @@ static int __init ppro_init(char ** cpu_type)
if (cpu_model == 14)
*cpu_type = "i386/core";
- else if (cpu_model == 15)
+ else if (cpu_model == 15 || cpu_model == 23)
*cpu_type = "i386/core_2";
else if (cpu_model > 0xd)
return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
