[git pull] x86 fixes for v2.6.24

[git pull] x86 fixes for v2.6.24

[Ingo Molnar]

Linus, please pull the latest x86 git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git

two fixes: a "make mrproper" bug and a new cpuid for oprofile, both 
build/boot tested.

	Ingo

------------------>
Arjan van de Ven (1):
      x86: add support for the latest Intel processors to Oprofile

Michael Opdenacker (1):
      x86: fix make mrproper

 Makefile                    |    2 +-
 arch/x86/oprofile/nmi_int.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 713f685..a7aa374 100644
--- a/Makefile
+++ b/Makefile
@@ -1088,7 +1088,7 @@ CLEAN_FILES +=	vmlinux System.map \
                 .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
 
 # 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
 MRPROPER_FILES += .config .config.old include/asm .version .old_version \
                   include/linux/autoconf.h include/linux/version.h      \
                   include/linux/utsrelease.h                            \
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;

Re: [git pull] x86 fixes for v2.6.24

[Sam Ravnborg]

On Fri, Jan 18, 2008 at 04:48:09PM +0100, Ingo Molnar wrote:
> 
> Linus, please pull the latest x86 git tree from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
> 
> two fixes: a "make mrproper" bug and a new cpuid for oprofile, both 
> build/boot tested.
> 
> 	Ingo
> 
> ------------------>
> Arjan van de Ven (1):
>       x86: add support for the latest Intel processors to Oprofile
> 
> Michael Opdenacker (1):
>       x86: fix make mrproper
> 
>  Makefile                    |    2 +-
>  arch/x86/oprofile/nmi_int.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 713f685..a7aa374 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1088,7 +1088,7 @@ CLEAN_FILES +=	vmlinux System.map \
>                  .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
>  
>  # 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

	Sam

Re: [git pull] x86 fixes for v2.6.24

[Ingo Molnar]

* Sam Ravnborg <sam@ravnborg.org> wrote:

> > @@ -1088,7 +1088,7 @@ CLEAN_FILES +=	vmlinux System.map \
> >                  .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
> >  
> >  # 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.

	Ingo

Re: [git pull] x86 fixes for v2.6.24

[Sam Ravnborg]

On Fri, Jan 18, 2008 at 09:51:52PM +0100, Ingo Molnar wrote:
> 
> * Sam Ravnborg <sam@ravnborg.org> wrote:
> 
> > > @@ -1088,7 +1088,7 @@ CLEAN_FILES +=	vmlinux System.map \
> > >                  .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
> > >  
> > >  # 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.

I would have preferred following solution.
And then the directory is killed during make clean as
opposed to make mrproper.

Not tested but seemed obvious.

	Sam

diff --git a/arch/x86/Makefile_32 b/arch/x86/Makefile_32
index 50394da..f806cec 100644
--- a/arch/x86/Makefile_32
+++ b/arch/x86/Makefile_32
@@ -156,7 +156,8 @@ install:
 	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
 
 archclean:
-	$(Q)rm -rf $(objtree)/arch/i386/boot
+	$(Q)rm -rf $(objtree)/arch/i386
+	$(Q)rm -rf $(objtree)/arch/x86_64
 	$(Q)$(MAKE) $(clean)=arch/x86/boot
 
 define archhelp
diff --git a/arch/x86/Makefile_64 b/arch/x86/Makefile_64
index a804860..93cf177 100644
--- a/arch/x86/Makefile_64
+++ b/arch/x86/Makefile_64
@@ -123,7 +123,8 @@ endif
 	$(Q)$(MAKE) $(build)=arch/x86/vdso $@
 
 archclean:
-	$(Q)rm -rf $(objtree)/arch/x86_64/boot
+	$(Q)rm -rf $(objtree)/arch/i386
+	$(Q)rm -rf $(objtree)/arch/x86_64
 	$(Q)$(MAKE) $(clean)=$(boot)
 
 define archhelp

Re: [git pull] x86 fixes for v2.6.24

[Ingo Molnar]

* Ingo Molnar <mingo@elte.hu> 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;