lkml.org 
[lkml]   [2008]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Linux v2.6.27-rc1
On Tue, Jul 29, 2008 at 03:03:47PM -0700, Linus Torvalds wrote:
>
>
> On Tue, 29 Jul 2008, Sam Ravnborg wrote:
> >
> > For arm the actual diff is:
> > Makefile | 20 +++++++-------------
> > boot/compressed/Makefile | 3 ---
> > tools/Makefile | 1 +
> > 3 files changed, 8 insertions(+), 16 deletions(-)
> >
> > But on top of this there are ~600 files that needed a
> > replacement of:
> > #include <asm/arch/foo.h>
> > to
> > #include <arch/foo.h>
>
> Yeah, that latter part doesn't strike me as wonderful.
>
> > So maybe not such a minimal patch - because I wanted to drop all
> > the symlink stuff.
>
> Why? There's nothing wrong with symlinks.
>
> The problem with 'include/asm' isn't the symlink per se, it's that it
> split up the architecture parts in two separate areas - arch and include.

I agree that we do this to combine all arch files. But we then have the
possibility to get rid of some build stuff that is fragile and needs
special care for O=.. builds etc.
So when we anyway do the renames I saw the opportunity to go one step
further.
Lets see how the x86 + um stuff looks like.

For x86 alone the patchs looks like this:

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index f5631da..c7493e7 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -110,16 +110,16 @@ KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
mcore-y := arch/x86/mach-default/

# Voyager subarch support
-mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-x86/mach-voyager
+mflags-$(CONFIG_X86_VOYAGER) := -Iarch/x86/include/mach-voyager
mcore-$(CONFIG_X86_VOYAGER) := arch/x86/mach-voyager/

# generic subarchitecture
-mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic
+mflags-$(CONFIG_X86_GENERICARCH):= -Iarch/x86/include/mach-generic
fcore-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default/

# default subarch .h files
-mflags-y += -Iinclude/asm-x86/mach-default
+mflags-y += -Iarch/x86/include/mach-default

# 64 bit does not support subarch support - clear sub arch variables
fcore-$(CONFIG_X86_64) :=
And the script to move the files looks like this:
set -e
for D in include/asm-x86/mach-*; do
echo $D
DD=$(echo $D | cut -d '-' -f 3)
mkdir -p arch/x86/include/mach-$DD/arch
git mv include/asm-x86/mach-$DD/* arch/x86/include/mach-$DD
rmdir include/asm-x86/mach-$DD
done
mkdir -p arch/x86/include/asm
git mv include/asm-x86/* arch/x86/include/asm
But I have not yet looked at um.

Sam


\
 
 \ /
  Last update: 2008-07-30 00:33    [W:0.058 / U:0.204 seconds]
©2003-2014 Jasper Spaans. Advertise on this site