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

[Sam Ravnborg <sam@ravnborg.org>]

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