diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 191e171b3672..510df782f940 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -86,7 +86,7 @@ mcore-$(CONFIG_X86_SUMMIT)  := arch/i386/mach-default
 # generic subarchitecture
 mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic
 mcore-$(CONFIG_X86_GENERICARCH) := arch/i386/mach-default
-core-$(CONFIG_X86_GENERICARCH) += arch/i386/mach-generic/
+core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
 
 # ES7000 subarch support
 mflags-$(CONFIG_X86_ES7000)	:= -Iinclude/asm-i386/mach-es7000
diff --git a/arch/i386/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
similarity index 100%
rename from arch/i386/mach-generic/Makefile
rename to arch/x86/mach-generic/Makefile
diff --git a/arch/i386/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
similarity index 100%
rename from arch/i386/mach-generic/bigsmp.c
rename to arch/x86/mach-generic/bigsmp.c
diff --git a/arch/i386/mach-generic/default.c b/arch/x86/mach-generic/default.c
similarity index 100%
rename from arch/i386/mach-generic/default.c
rename to arch/x86/mach-generic/default.c
diff --git a/arch/i386/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
similarity index 100%
rename from arch/i386/mach-generic/es7000.c
rename to arch/x86/mach-generic/es7000.c
diff --git a/arch/i386/mach-generic/probe.c b/arch/x86/mach-generic/probe.c
similarity index 100%
rename from arch/i386/mach-generic/probe.c
rename to arch/x86/mach-generic/probe.c
diff --git a/arch/i386/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
similarity index 100%
rename from arch/i386/mach-generic/summit.c
rename to arch/x86/mach-generic/summit.c