x86 fixes for v2.6.24
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(-)
Makefile +1 -1
@@ -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 \
arch/x86/oprofile/nmi_int.c +1 -1
@@ -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 ;
Quoted 26 lines · 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.gittwo 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 OprofileMichael Opdenacker (1):
x86: fix make mrproperMakefile | 2 +- arch/x86/oprofile/nmi_int.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)Makefile +0
-0
Makefile CLEAN_FILES += vmlinux System.map \ · line 1091
Quoted 5 lines
Makefile +1
-1@@ -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
Quoted 8 lines · Sam Ravnborg
Makefile CLEAN_FILES += vmlinux System.map \ · line 1091
Quoted 6 lines
Makefile +1
-1@@ -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_64sigh - arch specific stuff in the top-level
Makefile. This really belongs inarch/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
Quoted 6 lines · Ingo Molnar
Quoted 3 lines · Sam Ravnborg
Quoted 3 lines
(quoted diff) +0
-0@@ -1088,7 +1088,7 @@ CLEAN_FILES += vmlinux System.map \ .tmp_kallsyms* .tmp_version .tmp_vmlinux* .tmp_System.map
Quoted 8 lines
Quoted 5 lines
Review CLEAN_FILES += vmlinux System.map \ · line 1091
Quoted 3 lines
(quoted diff) +1
-1# Directories & files removed with 'make mrproper' -MRPROPER_DIRS += include/config include2 usr/include +MRPROPER_DIRS += include/config include2 usr/include arch/i386 arch/x86_64sigh - arch specific stuff in the top-level
Makefile. This really belongs inarch/x86/Makefileis 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
arch/x86/Makefile_32 +2 -1
@@ -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
arch/x86/Makefile_64 +2 -1
@@ -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
Quoted 8 lines · Ingo Molnar
Quoted 5 lines
Review
Quoted 3 lines
# Directories & files removed with 'make mrproper'
(quoted diff) +1
-1-MRPROPER_DIRS += include/config include2 usr/include +MRPROPER_DIRS += include/config include2 usr/include arch/i386 arch/x86_64sigh - arch specific stuff in the top-level
Makefile. This really belongs inarch/x86/Makefileis 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(-)
arch/x86/oprofile/nmi_int.c +1 -1
@@ -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 ;