[RFC] [PATCH] linux-2.5.49_subarch-cleanup_A2

[RFC] [PATCH] linux-2.5.49_subarch-cleanup_A2

[john stultz]

[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]

James, all,
	Ok, again, this patch tries to cleanup the subarch directories by
splitting up the .h files and moving them into
include/asm-i386/mach-xyz. It also lets the build fall back to the
default .h files in include/asm-i386/mach-default (renamed from
mach-generic as Alan suggested). 

Most of the patch is very boring file moves, so I've bziped and attached
it below. I've also inlined the Makefile changes as they are at least a
bit more interesting.

If there are no further comments, I'll re-submit w/o the rfc bit. 

thanks
-john

diff -Nru a/arch/i386/Makefile b/arch/i386/Makefile
--- a/arch/i386/Makefile	Mon Nov 25 17:32:39 2002
+++ b/arch/i386/Makefile	Mon Nov 25 17:32:39 2002
@@ -46,10 +46,13 @@
 
 CFLAGS += $(cflags-y)
 
-ifdef CONFIG_VISWS
-MACHINE	:= mach-visws
-else
-MACHINE	:= mach-generic
+#VISWS subarch support
+mflags-$(CONFIG_VISWS) := -Iinclude/asm-i386/mach-visws
+mcore-$(CONFIG_VISWS)  := mach-visws
+#default subarch support
+mflags-y += -Iinclude/asm-i386/mach-default
+ifndef mcore-y
+  mcore-y  := mach-default
 endif
 
 HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
@@ -57,14 +60,14 @@
 libs-y 					+= arch/i386/lib/
 core-y					+= arch/i386/kernel/ \
 					   arch/i386/mm/ \
-					   arch/i386/$(MACHINE)/
+					   arch/i386/$(mcore-y)/
 drivers-$(CONFIG_MATH_EMULATION)	+= arch/i386/math-emu/
 drivers-$(CONFIG_PCI)			+= arch/i386/pci/
 # FIXME: is drivers- right ?
 drivers-$(CONFIG_OPROFILE)		+= arch/i386/oprofile/
 
-CFLAGS += -Iarch/i386/$(MACHINE)
-AFLAGS += -Iarch/i386/$(MACHINE)
+CFLAGS += $(mflags-y)
+AFLAGS += $(mflags-y)
 
 makeboot = $(call descend,arch/i386/boot,$(1))
 



[-- Attachment #2: linux-2.5.49_subarch-cleanup_A2.patch.bz2 --]
[-- Type: application/x-bzip, Size: 11162 bytes --]

Re: [RFC] [PATCH] linux-2.5.49_subarch-cleanup_A2

[Sam Ravnborg]

On Mon, Nov 25, 2002 at 05:40:58PM -0800, john stultz wrote:
> If there are no further comments, I'll re-submit w/o the rfc bit. 

One detail..


> +#VISWS subarch support
> +mflags-$(CONFIG_VISWS) := -Iinclude/asm-i386/mach-visws
> +mcore-$(CONFIG_VISWS)  := mach-visws
> +#default subarch support
> +mflags-y += -Iinclude/asm-i386/mach-default
> +ifndef mcore-y
> +  mcore-y  := mach-default
>  endif
Move the "mcore-y := mach-default" assignment above the
block that deal with subarch. Then you do not need the "ifndef ..."

I recall that Linus previously have asked for shell commands
when moving files - so consider including only the patch below and
then a number of "mv arch/i386/X include/....".
This makes it much more visible what you actually change.

Another alternative it to do it in bitkeeper, then it is visible
from the cset that you move files (use bk mv).

	Sam

Re: [RFC] [PATCH] linux-2.5.49_subarch-cleanup_A2

[john stultz]

On Tue, 2002-11-26 at 11:54, Sam Ravnborg wrote:
> One detail..
> Move the "mcore-y := mach-default" assignment above the
> block that deal with subarch. Then you do not need the "ifndef ..."

Ah, good suggestion! Thanks! I'll apply and resubmit later today.

> I recall that Linus previously have asked for shell commands
> when moving files - so consider including only the patch below and
> then a number of "mv arch/i386/X include/....".
> This makes it much more visible what you actually change.
> 
> Another alternative it to do it in bitkeeper, then it is visible
> from the cset that you move files (use bk mv).

Hmm. I was under the impression that shell command and sed script
patches were only for those w/ enough kernel penguin points to blow.
Although, please someone correct me if I'm wrong.  Regardless BK should
notice the renames in the diff and import them as such, so it shouldn't
make much difference to Linus. 

Thanks again for the feedback!

-john