x86: Move uv to platform

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Mike Travis <travis@sgi.com>

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 4e1f862dd688ad1ae84f0aba3e5898f820b0092e..08e2e4bf83988be906a04a60d7ccf23e6b25dfc6 100644 (file)
--- 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
index 06761ed53747997840a0e058e4df858a28482d74..8519b01f1acb335fff6983dc8e1bdf0c87333990 100644 (file)
--- 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
new file mode 100644 (file)
index 0000000..6c40995
--- /dev/null
+++ 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 b/arch/x86/platform/uv/bios_uv.c
similarity index 100%
rename from arch/x86/kernel/bios_uv.c
rename to arch/x86/platform/uv/bios_uv.c

diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
similarity index 100%
rename from arch/x86/kernel/tlb_uv.c
rename to arch/x86/platform/uv/tlb_uv.c

diff --git a/arch/x86/kernel/uv_irq.c b/arch/x86/platform/uv/uv_irq.c
similarity index 100%
rename from arch/x86/kernel/uv_irq.c
rename to arch/x86/platform/uv/uv_irq.c

diff --git a/arch/x86/kernel/uv_sysfs.c b/arch/x86/platform/uv/uv_sysfs.c
similarity index 100%
rename from arch/x86/kernel/uv_sysfs.c
rename to arch/x86/platform/uv/uv_sysfs.c

diff --git a/arch/x86/kernel/uv_time.c b/arch/x86/platform/uv/uv_time.c
similarity index 100%
rename from arch/x86/kernel/uv_time.c
rename to arch/x86/platform/uv/uv_time.c