1 files changed, 39 insertions, 33 deletions

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 52b932478c6d..5e50dbf00f3e 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -17,6 +17,9 @@
 # 20050320  Kianusch Sayah Karadji <kianusch@sk-tech.net>
 #           Added support for GEODE CPU
 
+# Fill in SRCARCH
+SRCARCH := x86
+
 HAS_BIARCH      := $(call cc-option-yn, -m32)
 ifeq ($(HAS_BIARCH),y)
 AS              := $(AS) --32
@@ -61,62 +64,62 @@ AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONF
 CFLAGS += $(cflags-y)
 
 # Default subarch .c files
-mcore-y  := mach-default
+mcore-y  := arch/x86/mach-default
 
 # Voyager subarch support
-mflags-$(CONFIG_X86_VOYAGER)    := -Iinclude/asm-i386/mach-voyager
-mcore-$(CONFIG_X86_VOYAGER)     := mach-voyager
+mflags-$(CONFIG_X86_VOYAGER)    := -Iinclude/asm-x86/mach-voyager
+mcore-$(CONFIG_X86_VOYAGER)     := arch/x86/mach-voyager
 
 # VISWS subarch support
-mflags-$(CONFIG_X86_VISWS)      := -Iinclude/asm-i386/mach-visws
-mcore-$(CONFIG_X86_VISWS)       := mach-visws
+mflags-$(CONFIG_X86_VISWS)      := -Iinclude/asm-x86/mach-visws
+mcore-$(CONFIG_X86_VISWS)       := arch/x86/mach-visws
 
 # NUMAQ subarch support
-mflags-$(CONFIG_X86_NUMAQ)      := -Iinclude/asm-i386/mach-numaq
-mcore-$(CONFIG_X86_NUMAQ)       := mach-default
+mflags-$(CONFIG_X86_NUMAQ)      := -Iinclude/asm-x86/mach-numaq
+mcore-$(CONFIG_X86_NUMAQ)       := arch/x86/mach-default
 
 # BIGSMP subarch support
-mflags-$(CONFIG_X86_BIGSMP)     := -Iinclude/asm-i386/mach-bigsmp
-mcore-$(CONFIG_X86_BIGSMP)      := mach-default
+mflags-$(CONFIG_X86_BIGSMP)     := -Iinclude/asm-x86/mach-bigsmp
+mcore-$(CONFIG_X86_BIGSMP)      := arch/x86/mach-default
 
 #Summit subarch support
-mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit
-mcore-$(CONFIG_X86_SUMMIT)  := mach-default
+mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-x86/mach-summit
+mcore-$(CONFIG_X86_SUMMIT)  := arch/x86/mach-default
 
 # generic subarchitecture
-mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic
-mcore-$(CONFIG_X86_GENERICARCH) := mach-default
-core-$(CONFIG_X86_GENERICARCH) += arch/i386/mach-generic/
+mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-x86/mach-generic
+mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default
+core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
 
 # ES7000 subarch support
-mflags-$(CONFIG_X86_ES7000)     := -Iinclude/asm-i386/mach-es7000
-mcore-$(CONFIG_X86_ES7000)      := mach-default
-core-$(CONFIG_X86_ES7000)       := arch/i386/mach-es7000/
+mflags-$(CONFIG_X86_ES7000)     := -Iinclude/asm-x86/mach-es7000
+mcore-$(CONFIG_X86_ES7000)      := arch/x86/mach-default
+core-$(CONFIG_X86_ES7000)       := arch/x86/mach-es7000/
 
 # Xen paravirtualization support
-core-$(CONFIG_XEN)              += arch/i386/xen/
+core-$(CONFIG_XEN)              += arch/x86/xen/
 
 # default subarch .h files
-mflags-y += -Iinclude/asm-i386/mach-default
+mflags-y += -Iinclude/asm-x86/mach-default
 
-head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
+head-y := arch/x86/kernel/head_32.o arch/x86/kernel/init_task_32.o
 
-libs-y                                  += arch/i386/lib/
-core-y                                  += arch/i386/kernel/ \
-                                           arch/i386/mm/ \
-                                           arch/i386/$(mcore-y)/ \
-                                           arch/i386/crypto/
-drivers-$(CONFIG_MATH_EMULATION)        += arch/i386/math-emu/
-drivers-$(CONFIG_PCI)                   += arch/i386/pci/
+libs-y                                  += arch/x86/lib/
+core-y                                  += arch/x86/kernel/ \
+                                           arch/x86/mm/ \
+                                           $(mcore-y)/ \
+                                           arch/x86/crypto/
+drivers-$(CONFIG_MATH_EMULATION)        += arch/x86/math-emu/
+drivers-$(CONFIG_PCI)                   += arch/x86/pci/
 # must be linked after kernel/
-drivers-$(CONFIG_OPROFILE)              += arch/i386/oprofile/
-drivers-$(CONFIG_PM)                    += arch/i386/power/
-drivers-$(CONFIG_FB)                    += arch/i386/video/
+drivers-$(CONFIG_OPROFILE)              += arch/x86/oprofile/
+drivers-$(CONFIG_PM)                    += arch/x86/power/
+drivers-$(CONFIG_FB)                    += arch/x86/video/
 
 CFLAGS += $(mflags-y)
 AFLAGS += $(mflags-y)
 
-boot := arch/i386/boot
+boot := arch/x86/boot
 
 PHONY += zImage bzImage compressed zlilo bzlilo \
          zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install
@@ -125,9 +128,11 @@ all: bzImage
 
 # KBUILD_IMAGE specify target image being built
                     KBUILD_IMAGE := $(boot)/bzImage
-zImage zlilo zdisk: KBUILD_IMAGE := arch/i386/boot/zImage
+zImage zlilo zdisk: KBUILD_IMAGE := arch/x86/boot/zImage
 
 zImage bzImage: vmlinux
+        $(Q)mkdir -p $(objtree)/arch/i386/boot
+        $(Q)ln -fsn $(objtree)/arch/x86/boot/bzImage $(objtree)/arch/i386/boot/bzImage
         $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE)
 
 compressed: zImage
@@ -145,7 +150,8 @@ install:
         $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
 
 archclean:
-        $(Q)$(MAKE) $(clean)=arch/i386/boot
+        $(Q)rm -rf $(objtree)/arch/i386/boot
+        $(Q)$(MAKE) $(clean)=arch/x86/boot
 
 define archhelp
   echo  '* bzImage      - Compressed kernel image (arch/$(ARCH)/boot/bzImage)'