x86: Move uv to platform

Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Mike Travis <travis@sgi.com>
mariux64 · Oct 27, 2010 · 329b84e · 329b84e
1 parent 9694d4a
commit 329b84e
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 1 deletion.
diff --git a/arch/x86/kernel/Makefile b/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/arch/x86/platform/Makefile b/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/arch/x86/platform/uv/Makefile b/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/arch/x86/kernel/bios_uv.c → arch/x86/platform/uv/bios_uv.c b/arch/x86/kernel/bios_uv.c → arch/x86/platform/uv/bios_uv.c
diff --git a/arch/x86/kernel/tlb_uv.c → arch/x86/platform/uv/tlb_uv.c b/arch/x86/kernel/tlb_uv.c → arch/x86/platform/uv/tlb_uv.c
diff --git a/arch/x86/kernel/uv_irq.c → arch/x86/platform/uv/uv_irq.c b/arch/x86/kernel/uv_irq.c → arch/x86/platform/uv/uv_irq.c
diff --git a/arch/x86/kernel/uv_sysfs.c → arch/x86/platform/uv/uv_sysfs.c b/arch/x86/kernel/uv_sysfs.c → arch/x86/platform/uv/uv_sysfs.c
diff --git a/arch/x86/kernel/uv_time.c → arch/x86/platform/uv/uv_time.c b/arch/x86/kernel/uv_time.c → arch/x86/platform/uv/uv_time.c