diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 2c833d8c41418c0583ee2da48231918dd1a6c176..d9067d10c6af49531c3f66a3c4523be2b558b242 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -58,7 +58,6 @@ obj-$(CONFIG_INTEL_TXT)		+= tboot.o
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-y				+= cpu/
 obj-y				+= acpi/
-obj-$(CONFIG_SFI)		+= sfi.o
 obj-y				+= reboot.o
 obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)		+= msr.o
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
index fdf4113befba141ab4822169416fa18d8cf87d82..a964fa3c086858ee6a460073d89f40b5ab9651d3 100644
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
@@ -1 +1,2 @@
 # Platform specific code goes here
+obj-y	+= sfi/
diff --git a/arch/x86/platform/sfi/Makefile b/arch/x86/platform/sfi/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..cc5db1168a5ec41240c861aadb7b9d31a7e3fea8
--- /dev/null
+++ b/arch/x86/platform/sfi/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_SFI)		+= sfi.o
diff --git a/arch/x86/kernel/sfi.c b/arch/x86/platform/sfi/sfi.c
similarity index 100%
rename from arch/x86/kernel/sfi.c
rename to arch/x86/platform/sfi/sfi.c