85 files changed, 26 insertions, 19 deletions

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 397cfedb4b19..9c1da722964d 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -17,6 +17,13 @@
 # 20050320  Kianusch Sayah Karadji <kianusch@sk-tech.net>
 #           Added support for GEODE CPU
 
+# Fill in SRCARCH
+SRCARCH := x86
+
+archprepare:
+        @mkdir -p ${objtree}/arch/x86/kernel
+
+
 HAS_BIARCH      := $(call cc-option-yn, -m32)
 ifeq ($(HAS_BIARCH),y)
 AS              := $(AS) --32
@@ -99,10 +106,10 @@ core-$(CONFIG_XEN)		+= arch/x86/xen/
 # default subarch .h files
 mflags-y += -Iinclude/asm-i386/mach-default
 
-head-y := arch/i386/kernel/head_32.o arch/i386/kernel/init_task_32.o
+head-y := arch/x86/kernel/head_32.o arch/x86/kernel/init_task_32.o
 
 libs-y                                  += arch/x86/lib/
-core-y                                  += arch/i386/kernel/ \
+core-y                                  += arch/x86/kernel/ \
                                            arch/x86/mm/ \
                                            $(mcore-y)/ \
                                            arch/x86/crypto/
diff --git a/arch/um/sys-i386/sys_call_table.S b/arch/um/sys-i386/sys_call_table.S
index 4c1f17d7986d..12d4148dba39 100644
--- a/arch/um/sys-i386/sys_call_table.S
+++ b/arch/um/sys-i386/sys_call_table.S
@@ -9,4 +9,4 @@
 
 #define old_mmap old_mmap_i386
 
-#include "../../i386/kernel/syscall_table_32.S"
+#include "../../x86/kernel/syscall_table_32.S"
diff --git a/arch/i386/kernel/.gitignore b/arch/x86/kernel/.gitignore
index 40836ad9079c..40836ad9079c 100644
--- a/arch/i386/kernel/.gitignore
+++ b/arch/x86/kernel/.gitignore
diff --git a/arch/i386/kernel/Makefile b/arch/x86/kernel/Makefile
index d3ebd1699826..577d08f4b8bb 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/kernel/Makefile_32
+include ${srctree}/arch/x86/kernel/Makefile_32
 else
 include ${srctree}/arch/x86_64/kernel/Makefile_64
 endif
diff --git a/arch/i386/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32
index 5096f486d389..5096f486d389 100644
--- a/arch/i386/kernel/Makefile_32
+++ b/arch/x86/kernel/Makefile_32
diff --git a/arch/i386/kernel/alternative.c b/arch/x86/kernel/alternative.c
index bd72d94e713e..bd72d94e713e 100644
--- a/arch/i386/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
diff --git a/arch/i386/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 3d67ae18d762..3d67ae18d762 100644
--- a/arch/i386/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
diff --git a/arch/i386/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index f02a8aca826b..f02a8aca826b 100644
--- a/arch/i386/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
diff --git a/arch/i386/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
index cfa82c899f47..cfa82c899f47 100644
--- a/arch/i386/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
diff --git a/arch/i386/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index 8029742c0fc1..8029742c0fc1 100644
--- a/arch/i386/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
diff --git a/arch/i386/kernel/bootflag.c b/arch/x86/kernel/bootflag.c
index 0b9860530a6b..0b9860530a6b 100644
--- a/arch/i386/kernel/bootflag.c
+++ b/arch/x86/kernel/bootflag.c
diff --git a/arch/i386/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 5c2faa10e9fa..5c2faa10e9fa 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
diff --git a/arch/i386/kernel/crash_32.c b/arch/x86/kernel/crash_32.c
index 53589d1b1a05..53589d1b1a05 100644
--- a/arch/i386/kernel/crash_32.c
+++ b/arch/x86/kernel/crash_32.c
diff --git a/arch/i386/kernel/crash_dump_32.c b/arch/x86/kernel/crash_dump_32.c
index 3f532df488bc..3f532df488bc 100644
--- a/arch/i386/kernel/crash_dump_32.c
+++ b/arch/x86/kernel/crash_dump_32.c
diff --git a/arch/i386/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
index 40978af630e7..40978af630e7 100644
--- a/arch/i386/kernel/doublefault_32.c
+++ b/arch/x86/kernel/doublefault_32.c
diff --git a/arch/i386/kernel/e820_32.c b/arch/x86/kernel/e820_32.c
index 3c86b979a40a..3c86b979a40a 100644
--- a/arch/i386/kernel/e820_32.c
+++ b/arch/x86/kernel/e820_32.c
diff --git a/arch/i386/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index 92f812ba275c..92f812ba275c 100644
--- a/arch/i386/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
diff --git a/arch/i386/kernel/efi_32.c b/arch/x86/kernel/efi_32.c
index 2452c6fbe992..2452c6fbe992 100644
--- a/arch/i386/kernel/efi_32.c
+++ b/arch/x86/kernel/efi_32.c
diff --git a/arch/i386/kernel/efi_stub_32.S b/arch/x86/kernel/efi_stub_32.S
index ef00bb77d7e4..ef00bb77d7e4 100644
--- a/arch/i386/kernel/efi_stub_32.S
+++ b/arch/x86/kernel/efi_stub_32.S
diff --git a/arch/i386/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 290b7bc82da3..290b7bc82da3 100644
--- a/arch/i386/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
diff --git a/arch/i386/kernel/geode_32.c b/arch/x86/kernel/geode_32.c
index 41e8aec4c61d..41e8aec4c61d 100644
--- a/arch/i386/kernel/geode_32.c
+++ b/arch/x86/kernel/geode_32.c
diff --git a/arch/i386/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 9150ca9b5f80..9150ca9b5f80 100644
--- a/arch/i386/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
diff --git a/arch/i386/kernel/hpet_32.c b/arch/x86/kernel/hpet_32.c
index 533d4932bc79..533d4932bc79 100644
--- a/arch/i386/kernel/hpet_32.c
+++ b/arch/x86/kernel/hpet_32.c
diff --git a/arch/i386/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
index e3d4b73bfdb0..e3d4b73bfdb0 100644
--- a/arch/i386/kernel/i386_ksyms_32.c
+++ b/arch/x86/kernel/i386_ksyms_32.c
diff --git a/arch/i386/kernel/i387_32.c b/arch/x86/kernel/i387_32.c
index 665847281ed2..665847281ed2 100644
--- a/arch/i386/kernel/i387_32.c
+++ b/arch/x86/kernel/i387_32.c
diff --git a/arch/i386/kernel/i8237.c b/arch/x86/kernel/i8237.c
index 6f508e8d7c57..6f508e8d7c57 100644
--- a/arch/i386/kernel/i8237.c
+++ b/arch/x86/kernel/i8237.c
diff --git a/arch/i386/kernel/i8253_32.c b/arch/x86/kernel/i8253_32.c
index 6d839f2f1b1a..6d839f2f1b1a 100644
--- a/arch/i386/kernel/i8253_32.c
+++ b/arch/x86/kernel/i8253_32.c
diff --git a/arch/i386/kernel/i8259_32.c b/arch/x86/kernel/i8259_32.c
index 0499cbe9871a..0499cbe9871a 100644
--- a/arch/i386/kernel/i8259_32.c
+++ b/arch/x86/kernel/i8259_32.c
diff --git a/arch/i386/kernel/init_task_32.c b/arch/x86/kernel/init_task_32.c
index d26fc063a760..d26fc063a760 100644
--- a/arch/i386/kernel/init_task_32.c
+++ b/arch/x86/kernel/init_task_32.c
diff --git a/arch/i386/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index e2f4a1c68547..e2f4a1c68547 100644
--- a/arch/i386/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
diff --git a/arch/i386/kernel/ioport_32.c b/arch/x86/kernel/ioport_32.c
index 3d310a946d76..3d310a946d76 100644
--- a/arch/i386/kernel/ioport_32.c
+++ b/arch/x86/kernel/ioport_32.c
diff --git a/arch/i386/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index dd2b97fc00b2..dd2b97fc00b2 100644
--- a/arch/i386/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
diff --git a/arch/i386/kernel/kprobes_32.c b/arch/x86/kernel/kprobes_32.c
index 448a50b1324c..448a50b1324c 100644
--- a/arch/i386/kernel/kprobes_32.c
+++ b/arch/x86/kernel/kprobes_32.c
diff --git a/arch/i386/kernel/ldt_32.c b/arch/x86/kernel/ldt_32.c
index e0b2d17f4f10..e0b2d17f4f10 100644
--- a/arch/i386/kernel/ldt_32.c
+++ b/arch/x86/kernel/ldt_32.c
diff --git a/arch/i386/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index 91966bafb3dc..91966bafb3dc 100644
--- a/arch/i386/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
diff --git a/arch/i386/kernel/mca_32.c b/arch/x86/kernel/mca_32.c
index b83672b89527..b83672b89527 100644
--- a/arch/i386/kernel/mca_32.c
+++ b/arch/x86/kernel/mca_32.c
diff --git a/arch/i386/kernel/microcode.c b/arch/x86/kernel/microcode.c
index 09cf78110358..09cf78110358 100644
--- a/arch/i386/kernel/microcode.c
+++ b/arch/x86/kernel/microcode.c
diff --git a/arch/i386/kernel/module_32.c b/arch/x86/kernel/module_32.c
index 3db0a5442eb1..3db0a5442eb1 100644
--- a/arch/i386/kernel/module_32.c
+++ b/arch/x86/kernel/module_32.c
diff --git a/arch/i386/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 13abb4ebfb79..13abb4ebfb79 100644
--- a/arch/i386/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
diff --git a/arch/i386/kernel/msr.c b/arch/x86/kernel/msr.c
index 0c1069b8d638..0c1069b8d638 100644
--- a/arch/i386/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
diff --git a/arch/i386/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
index c7227e2180f8..c7227e2180f8 100644
--- a/arch/i386/kernel/nmi_32.c
+++ b/arch/x86/kernel/nmi_32.c
diff --git a/arch/i386/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index 9000d82c6dc0..9000d82c6dc0 100644
--- a/arch/i386/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
diff --git a/arch/i386/kernel/paravirt_32.c b/arch/x86/kernel/paravirt_32.c
index 739cfb207dd7..739cfb207dd7 100644
--- a/arch/i386/kernel/paravirt_32.c
+++ b/arch/x86/kernel/paravirt_32.c
diff --git a/arch/i386/kernel/pci-dma_32.c b/arch/x86/kernel/pci-dma_32.c
index 048f09b62553..048f09b62553 100644
--- a/arch/i386/kernel/pci-dma_32.c
+++ b/arch/x86/kernel/pci-dma_32.c
diff --git a/arch/i386/kernel/pcspeaker.c b/arch/x86/kernel/pcspeaker.c
index bc1f2d3ea277..bc1f2d3ea277 100644
--- a/arch/i386/kernel/pcspeaker.c
+++ b/arch/x86/kernel/pcspeaker.c
diff --git a/arch/i386/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 84664710b784..84664710b784 100644
--- a/arch/i386/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
diff --git a/arch/i386/kernel/ptrace_32.c b/arch/x86/kernel/ptrace_32.c
index 7c1b92522e95..7c1b92522e95 100644
--- a/arch/i386/kernel/ptrace_32.c
+++ b/arch/x86/kernel/ptrace_32.c
diff --git a/arch/i386/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 6722469c2633..6722469c2633 100644
--- a/arch/i386/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
diff --git a/arch/i386/kernel/reboot_32.c b/arch/x86/kernel/reboot_32.c
index 0d796248866c..0d796248866c 100644
--- a/arch/i386/kernel/reboot_32.c
+++ b/arch/x86/kernel/reboot_32.c
diff --git a/arch/i386/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
index 03e1cce58f49..03e1cce58f49 100644
--- a/arch/i386/kernel/reboot_fixups_32.c
+++ b/arch/x86/kernel/reboot_fixups_32.c
diff --git a/arch/i386/kernel/relocate_kernel_32.S b/arch/x86/kernel/relocate_kernel_32.S
index f151d6fae462..f151d6fae462 100644
--- a/arch/i386/kernel/relocate_kernel_32.S
+++ b/arch/x86/kernel/relocate_kernel_32.S
diff --git a/arch/i386/kernel/scx200_32.c b/arch/x86/kernel/scx200_32.c
index c7d3df23f589..c7d3df23f589 100644
--- a/arch/i386/kernel/scx200_32.c
+++ b/arch/x86/kernel/scx200_32.c
diff --git a/arch/i386/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index d474cd639bcb..d474cd639bcb 100644
--- a/arch/i386/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
diff --git a/arch/i386/kernel/sigframe_32.h b/arch/x86/kernel/sigframe_32.h
index 0b2221711dad..0b2221711dad 100644
--- a/arch/i386/kernel/sigframe_32.h
+++ b/arch/x86/kernel/sigframe_32.h
diff --git a/arch/i386/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index c03570f7fe8e..c03570f7fe8e 100644
--- a/arch/i386/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
diff --git a/arch/i386/kernel/smp_32.c b/arch/x86/kernel/smp_32.c
index 2d35d8502029..2d35d8502029 100644
--- a/arch/i386/kernel/smp_32.c
+++ b/arch/x86/kernel/smp_32.c
diff --git a/arch/i386/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index e4f61d1c6248..e4f61d1c6248 100644
--- a/arch/i386/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
diff --git a/arch/i386/kernel/smpcommon_32.c b/arch/x86/kernel/smpcommon_32.c
index bbfe85a0f699..bbfe85a0f699 100644
--- a/arch/i386/kernel/smpcommon_32.c
+++ b/arch/x86/kernel/smpcommon_32.c
diff --git a/arch/i386/kernel/srat_32.c b/arch/x86/kernel/srat_32.c
index 2a8713ec0f9a..2a8713ec0f9a 100644
--- a/arch/i386/kernel/srat_32.c
+++ b/arch/x86/kernel/srat_32.c
diff --git a/arch/i386/kernel/summit_32.c b/arch/x86/kernel/summit_32.c
index d0e01a3acf35..d0e01a3acf35 100644
--- a/arch/i386/kernel/summit_32.c
+++ b/arch/x86/kernel/summit_32.c
diff --git a/arch/i386/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
index 42147304de88..42147304de88 100644
--- a/arch/i386/kernel/sys_i386_32.c
+++ b/arch/x86/kernel/sys_i386_32.c
diff --git a/arch/i386/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
index 8344c70adf61..8344c70adf61 100644
--- a/arch/i386/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
diff --git a/arch/i386/kernel/sysenter_32.c b/arch/x86/kernel/sysenter_32.c
index 4eb2e408764f..4eb2e408764f 100644
--- a/arch/i386/kernel/sysenter_32.c
+++ b/arch/x86/kernel/sysenter_32.c
diff --git a/arch/i386/kernel/time_32.c b/arch/x86/kernel/time_32.c
index 19a6c678d02e..19a6c678d02e 100644
--- a/arch/i386/kernel/time_32.c
+++ b/arch/x86/kernel/time_32.c
diff --git a/arch/i386/kernel/topology.c b/arch/x86/kernel/topology.c
index 45782356a618..45782356a618 100644
--- a/arch/i386/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
diff --git a/arch/i386/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
index f62815f8d06a..f62815f8d06a 100644
--- a/arch/i386/kernel/trampoline_32.S
+++ b/arch/x86/kernel/trampoline_32.S
diff --git a/arch/i386/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 47b0bef335bd..47b0bef335bd 100644
--- a/arch/i386/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
diff --git a/arch/i386/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c
index a39280b4dd3a..a39280b4dd3a 100644
--- a/arch/i386/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
diff --git a/arch/i386/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index 12424629af87..12424629af87 100644
--- a/arch/i386/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
diff --git a/arch/i386/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
index f2dcd1d27c0a..f2dcd1d27c0a 100644
--- a/arch/i386/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
diff --git a/arch/i386/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
index 18673e0f193b..18673e0f193b 100644
--- a/arch/i386/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
diff --git a/arch/i386/kernel/vmiclock_32.c b/arch/x86/kernel/vmiclock_32.c
index b1b5ab08b26e..b1b5ab08b26e 100644
--- a/arch/i386/kernel/vmiclock_32.c
+++ b/arch/x86/kernel/vmiclock_32.c
diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 849ee611f013..849ee611f013 100644
--- a/arch/i386/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
diff --git a/arch/i386/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
index 7d72cce00529..7d72cce00529 100644
--- a/arch/i386/kernel/vmlinux_32.lds.S
+++ b/arch/x86/kernel/vmlinux_32.lds.S
diff --git a/arch/i386/kernel/vsyscall-int80_32.S b/arch/x86/kernel/vsyscall-int80_32.S
index 103cab6aa7c0..103cab6aa7c0 100644
--- a/arch/i386/kernel/vsyscall-int80_32.S
+++ b/arch/x86/kernel/vsyscall-int80_32.S
diff --git a/arch/i386/kernel/vsyscall-note_32.S b/arch/x86/kernel/vsyscall-note_32.S
index fcf376a37f79..fcf376a37f79 100644
--- a/arch/i386/kernel/vsyscall-note_32.S
+++ b/arch/x86/kernel/vsyscall-note_32.S
diff --git a/arch/i386/kernel/vsyscall-sigreturn_32.S b/arch/x86/kernel/vsyscall-sigreturn_32.S
index a92262f41659..a92262f41659 100644
--- a/arch/i386/kernel/vsyscall-sigreturn_32.S
+++ b/arch/x86/kernel/vsyscall-sigreturn_32.S
diff --git a/arch/i386/kernel/vsyscall-sysenter_32.S b/arch/x86/kernel/vsyscall-sysenter_32.S
index ed879bf42995..ed879bf42995 100644
--- a/arch/i386/kernel/vsyscall-sysenter_32.S
+++ b/arch/x86/kernel/vsyscall-sysenter_32.S
diff --git a/arch/i386/kernel/vsyscall_32.S b/arch/x86/kernel/vsyscall_32.S
index 033074479fca..a5ab3dc4fd25 100644
--- a/arch/i386/kernel/vsyscall_32.S
+++ b/arch/x86/kernel/vsyscall_32.S
@@ -4,12 +4,12 @@ __INITDATA
 
         .globl vsyscall_int80_start, vsyscall_int80_end
 vsyscall_int80_start:
-        .incbin "arch/i386/kernel/vsyscall-int80_32.so"
+        .incbin "arch/x86/kernel/vsyscall-int80_32.so"
 vsyscall_int80_end:
 
         .globl vsyscall_sysenter_start, vsyscall_sysenter_end
 vsyscall_sysenter_start:
-        .incbin "arch/i386/kernel/vsyscall-sysenter_32.so"
+        .incbin "arch/x86/kernel/vsyscall-sysenter_32.so"
 vsyscall_sysenter_end:
 
 __FINIT
diff --git a/arch/i386/kernel/vsyscall_32.lds.S b/arch/x86/kernel/vsyscall_32.lds.S
index 4a8b0ed9b8fb..4a8b0ed9b8fb 100644
--- a/arch/i386/kernel/vsyscall_32.lds.S
+++ b/arch/x86/kernel/vsyscall_32.lds.S
diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
index 08f489a7f1f5..19d6d407737b 100644
--- a/arch/x86/mach-generic/Makefile
+++ b/arch/x86/mach-generic/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the generic architecture
 #
 
-EXTRA_CFLAGS    := -Iarch/i386/kernel
+EXTRA_CFLAGS    := -Iarch/x86/kernel
 
 obj-y           := probe.o summit.o bigsmp.o es7000.o default.o 
 obj-y           += ../../x86/mach-es7000/
diff --git a/arch/x86/mach-voyager/Makefile b/arch/x86/mach-voyager/Makefile
index 33b74cf0dd22..15c250b371d3 100644
--- a/arch/x86/mach-voyager/Makefile
+++ b/arch/x86/mach-voyager/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-EXTRA_CFLAGS    := -Iarch/i386/kernel
+EXTRA_CFLAGS    := -Iarch/x86/kernel
 obj-y                   := setup.o voyager_basic.o voyager_thread.o
 
 obj-$(CONFIG_SMP)       += voyager_smp.o voyager_cat.o
diff --git a/arch/x86_64/ia32/vsyscall-sigreturn.S b/arch/x86_64/ia32/vsyscall-sigreturn.S
index 83e7fd683c3d..b383be00baec 100644
--- a/arch/x86_64/ia32/vsyscall-sigreturn.S
+++ b/arch/x86_64/ia32/vsyscall-sigreturn.S
@@ -139,5 +139,5 @@ __kernel_rt_sigreturn:
         .align 4
 .LENDFDE3:
 
-#include "../../i386/kernel/vsyscall-note_32.S"
+#include "../../x86/kernel/vsyscall-note_32.S"
 
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index d3ebd1699826..577d08f4b8bb 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/kernel/Makefile_32
+include ${srctree}/arch/x86/kernel/Makefile_32
 else
 include ${srctree}/arch/x86_64/kernel/Makefile_64
 endif
diff --git a/arch/x86_64/kernel/Makefile_64 b/arch/x86_64/kernel/Makefile_64
index 690aebf37c37..3a204cc599d7 100644
--- a/arch/x86_64/kernel/Makefile_64
+++ b/arch/x86_64/kernel/Makefile_64
@@ -49,15 +49,15 @@ obj-y				+= pcspeaker.o
 CFLAGS_vsyscall_64.o            := $(PROFILING) -g0
 
 therm_throt-y                   += ../../x86/kernel/cpu/mcheck/therm_throt.o
-bootflag-y                      += ../../i386/kernel/bootflag.o
-cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
-topology-y                     += ../../i386/kernel/topology.o
-microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
+bootflag-y                      += ../../x86/kernel/bootflag.o
+cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../x86/kernel/cpuid.o
+topology-y                     += ../../x86/kernel/topology.o
+microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../x86/kernel/microcode.o
 intel_cacheinfo-y               += ../../x86/kernel/cpu/intel_cacheinfo.o
 addon_cpuid_features-y          += ../../x86/kernel/cpu/addon_cpuid_features.o
-quirks-y                        += ../../i386/kernel/quirks.o
-i8237-y                         += ../../i386/kernel/i8237.o
-msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
-alternative-y                   += ../../i386/kernel/alternative.o
-pcspeaker-y                     += ../../i386/kernel/pcspeaker.o
+quirks-y                        += ../../x86/kernel/quirks.o
+i8237-y                         += ../../x86/kernel/i8237.o
+msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../x86/kernel/msr.o
+alternative-y                   += ../../x86/kernel/alternative.o
+pcspeaker-y                     += ../../x86/kernel/pcspeaker.o
 perfctr-watchdog-y              += ../../x86/kernel/cpu/perfctr-watchdog.o