[arch/i386 subarch split] rename directories, move mpparse back to kernel

arch/i386/Makefile

@@ -87,9 +87,9 @@ CFLAGS += -march=i586
 endif
 
 ifdef CONFIG_VISWS
-MACHINE	:= visws
+MACHINE	:= mach-visws
 else
-MACHINE	:= generic
+MACHINE	:= mach-generic
 endif
 
 HEAD := arch/i386/kernel/head.o arch/i386/kernel/init_task.o

arch/i386/config.in

@@ -241,6 +241,7 @@ else
    if [ "$CONFIG_SMP" = "y" ]; then
       define_bool CONFIG_X86_IO_APIC y
       define_bool CONFIG_X86_LOCAL_APIC y
+      define_bool CONFIG_X86_MPPARSE y
    fi
    bool 'PCI support' CONFIG_PCI
    if [ "$CONFIG_PCI" = "y" ]; then

arch/i386/kernel/Makefile

@@ -23,6 +23,7 @@ obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_MICROCODE)		+= microcode.o
 obj-$(CONFIG_APM)		+= apm.o
 obj-$(CONFIG_X86_SMP)		+= smp.o smpboot.o trampoline.o
+obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o nmi.o
 obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
 obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend.o

arch/i386/generic/Makefile → arch/i386/mach-generic/Makefile

@@ -10,15 +10,12 @@
 .S.o:
 	$(CC) $(AFLAGS) -traditional -c $< -o $*.o
 
-all: generic.o
+all: mach-generic.o
 
-O_TARGET 	:= generic.o
+O_TARGET 	:= mach-generic.o
 EXTRA_CFLAGS	+= -I../kernel
 export-objs     := 
 
 obj-y				:= setup.o
 
-obj-$(CONFIG_PCI)		+= pci-pc.o pci-irq.o
-obj-$(CONFIG_X86_LOCAL_APIC)	+= mpparse.o
-
 include $(TOPDIR)/Rules.make

arch/i386/visws/Makefile → arch/i386/mach-visws/Makefile

@@ -10,9 +10,9 @@
 .S.o:
 	$(CC) $(AFLAGS) -traditional -c $< -o $*.o
 
-all: visws.o
+all: mach-visws.o
 
-O_TARGET 	:= visws.o
+O_TARGET 	:= mach-visws.o
 EXTRA_CFLAGS	+= -I../kernel
 export-objs     :=