[RFC] [PATCH] subarch-cleanup_A1

From: john stultz (johnstul@us.ibm.com)
Date: Thu Nov 21 2002 - 20:46:36 EST


Ok, next pass. How about this: (complete patch bz'ed and attached)

diff -Nru a/arch/i386/Makefile b/arch/i386/Makefile
--- a/arch/i386/Makefile Thu Nov 21 17:37:35 2002
+++ b/arch/i386/Makefile Thu Nov 21 17:37:35 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
+#generic subarch support
+mflags-y += -Iinclude/asm-i386/mach-generic
+ifndef mcore-y
+ mcore-y := mach-generic
 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))
 
diff -Nru a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
--- a/arch/i386/kernel/apic.c Thu Nov 21 17:37:35 2002
+++ b/arch/i386/kernel/apic.c Thu Nov 21 17:37:35 2002
@@ -31,7 +31,8 @@
 #include <asm/pgalloc.h>
 #include <asm/desc.h>
 #include <asm/arch_hooks.h>
-#include "mach_apic.h"
+
+#include <mach_apic.h>
 
 void __init apic_intr_init(void)
 {

yada yada...
-john



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Nov 23 2002 - 22:00:39 EST