diff --git a/[refs] b/[refs]
index 361f78d71fac..59e4645aea3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9694d4afc1ebe1e46cacfb78b107cd8f9fb550ba
+refs/heads/master: 329b84e42e3ee348b114fd0bfe4b2421e6139257
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
index 4e1f862dd688..08e2e4bf8398 100644
--- a/trunk/arch/x86/kernel/Makefile
+++ b/trunk/arch/x86/kernel/Makefile
@@ -117,7 +117,6 @@ obj-$(CONFIG_SWIOTLB)			+= pci-swiotlb.o
 ###
 # 64 bit specific files
 ifeq ($(CONFIG_X86_64),y)
-	obj-$(CONFIG_X86_UV)		+= tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o
 	obj-$(CONFIG_AUDIT)		+= audit_64.o
 
 	obj-$(CONFIG_GART_IOMMU)	+= pci-gart_64.o aperture_64.o
diff --git a/trunk/arch/x86/platform/Makefile b/trunk/arch/x86/platform/Makefile
index 06761ed53747..8519b01f1acb 100644
--- a/trunk/arch/x86/platform/Makefile
+++ b/trunk/arch/x86/platform/Makefile
@@ -4,3 +4,4 @@ obj-y	+= mrst/
 obj-y	+= scx200/
 obj-y	+= sfi/
 obj-y	+= visws/
+obj-y	+= uv/
diff --git a/trunk/arch/x86/platform/uv/Makefile b/trunk/arch/x86/platform/uv/Makefile
new file mode 100644
index 000000000000..6c40995fefb8
--- /dev/null
+++ b/trunk/arch/x86/platform/uv/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_X86_UV)		+= tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o
diff --git a/trunk/arch/x86/kernel/bios_uv.c b/trunk/arch/x86/platform/uv/bios_uv.c
similarity index 100%
rename from trunk/arch/x86/kernel/bios_uv.c
rename to trunk/arch/x86/platform/uv/bios_uv.c
diff --git a/trunk/arch/x86/kernel/tlb_uv.c b/trunk/arch/x86/platform/uv/tlb_uv.c
similarity index 100%
rename from trunk/arch/x86/kernel/tlb_uv.c
rename to trunk/arch/x86/platform/uv/tlb_uv.c
diff --git a/trunk/arch/x86/kernel/uv_irq.c b/trunk/arch/x86/platform/uv/uv_irq.c
similarity index 100%
rename from trunk/arch/x86/kernel/uv_irq.c
rename to trunk/arch/x86/platform/uv/uv_irq.c
diff --git a/trunk/arch/x86/kernel/uv_sysfs.c b/trunk/arch/x86/platform/uv/uv_sysfs.c
similarity index 100%
rename from trunk/arch/x86/kernel/uv_sysfs.c
rename to trunk/arch/x86/platform/uv/uv_sysfs.c
diff --git a/trunk/arch/x86/kernel/uv_time.c b/trunk/arch/x86/platform/uv/uv_time.c
similarity index 100%
rename from trunk/arch/x86/kernel/uv_time.c
rename to trunk/arch/x86/platform/uv/uv_time.c