diff --git a/arch/i386/kernel/Makefile_32 b/arch/i386/kernel/Makefile_32
index af8304b921de95176419378263efce3092e1ae4c..5096f486d389592378e1b6c2d2742c0e19c82393 100644
--- a/arch/i386/kernel/Makefile_32
+++ b/arch/i386/kernel/Makefile_32
@@ -10,7 +10,7 @@ obj-y	:= process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
 		quirks.o i8237.o topology.o alternative.o i8253_32.o tsc_32.o
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
-obj-y				+= cpu/
+obj-y				+= ../../x86/kernel/cpu/
 obj-y				+= ../../x86/kernel/acpi/
 obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot_32.o
 obj-$(CONFIG_MCA)		+= mca_32.o
diff --git a/arch/i386/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
similarity index 100%
rename from arch/i386/kernel/cpu/Makefile
rename to arch/x86/kernel/cpu/Makefile
diff --git a/arch/i386/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c
similarity index 100%
rename from arch/i386/kernel/cpu/addon_cpuid_features.c
rename to arch/x86/kernel/cpu/addon_cpuid_features.c
diff --git a/arch/i386/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
similarity index 100%
rename from arch/i386/kernel/cpu/amd.c
rename to arch/x86/kernel/cpu/amd.c
diff --git a/arch/i386/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
similarity index 100%
rename from arch/i386/kernel/cpu/bugs.c
rename to arch/x86/kernel/cpu/bugs.c
diff --git a/arch/i386/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
similarity index 100%
rename from arch/i386/kernel/cpu/centaur.c
rename to arch/x86/kernel/cpu/centaur.c
diff --git a/arch/i386/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
similarity index 100%
rename from arch/i386/kernel/cpu/common.c
rename to arch/x86/kernel/cpu/common.c
diff --git a/arch/i386/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h
similarity index 100%
rename from arch/i386/kernel/cpu/cpu.h
rename to arch/x86/kernel/cpu/cpu.h
diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
similarity index 100%
rename from arch/i386/kernel/cpu/cyrix.c
rename to arch/x86/kernel/cpu/cyrix.c
diff --git a/arch/i386/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
similarity index 100%
rename from arch/i386/kernel/cpu/intel.c
rename to arch/x86/kernel/cpu/intel.c
diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
similarity index 100%
rename from arch/i386/kernel/cpu/intel_cacheinfo.c
rename to arch/x86/kernel/cpu/intel_cacheinfo.c
diff --git a/arch/i386/kernel/cpu/nexgen.c b/arch/x86/kernel/cpu/nexgen.c
similarity index 100%
rename from arch/i386/kernel/cpu/nexgen.c
rename to arch/x86/kernel/cpu/nexgen.c
diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
similarity index 100%
rename from arch/i386/kernel/cpu/perfctr-watchdog.c
rename to arch/x86/kernel/cpu/perfctr-watchdog.c
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
similarity index 100%
rename from arch/i386/kernel/cpu/proc.c
rename to arch/x86/kernel/cpu/proc.c
diff --git a/arch/i386/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c
similarity index 100%
rename from arch/i386/kernel/cpu/transmeta.c
rename to arch/x86/kernel/cpu/transmeta.c
diff --git a/arch/i386/kernel/cpu/umc.c b/arch/x86/kernel/cpu/umc.c
similarity index 100%
rename from arch/i386/kernel/cpu/umc.c
rename to arch/x86/kernel/cpu/umc.c
diff --git a/arch/x86_64/kernel/Makefile_64 b/arch/x86_64/kernel/Makefile_64
index e748050910342de949f5eab25b488dc2ba22465c..690aebf37c374d46bfd0ebb0b3982a7cbe4d4da2 100644
--- a/arch/x86_64/kernel/Makefile_64
+++ b/arch/x86_64/kernel/Makefile_64
@@ -53,11 +53,11 @@ 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
-intel_cacheinfo-y		+= ../../i386/kernel/cpu/intel_cacheinfo.o
-addon_cpuid_features-y		+= ../../i386/kernel/cpu/addon_cpuid_features.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
-perfctr-watchdog-y		+= ../../i386/kernel/cpu/perfctr-watchdog.o
+perfctr-watchdog-y		+= ../../x86/kernel/cpu/perfctr-watchdog.o