From 329b84e42e3ee348b114fd0bfe4b2421e6139257 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 23 Oct 2010 11:23:37 +0200 Subject: [PATCH] x86: Move uv to platform Signed-off-by: Thomas Gleixner Cc: Mike Travis --- arch/x86/kernel/Makefile | 1 - arch/x86/platform/Makefile | 1 + arch/x86/platform/uv/Makefile | 1 + arch/x86/{kernel => platform/uv}/bios_uv.c | 0 arch/x86/{kernel => platform/uv}/tlb_uv.c | 0 arch/x86/{kernel => platform/uv}/uv_irq.c | 0 arch/x86/{kernel => platform/uv}/uv_sysfs.c | 0 arch/x86/{kernel => platform/uv}/uv_time.c | 0 8 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 arch/x86/platform/uv/Makefile rename arch/x86/{kernel => platform/uv}/bios_uv.c (100%) rename arch/x86/{kernel => platform/uv}/tlb_uv.c (100%) rename arch/x86/{kernel => platform/uv}/uv_irq.c (100%) rename arch/x86/{kernel => platform/uv}/uv_sysfs.c (100%) rename arch/x86/{kernel => platform/uv}/uv_time.c (100%) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 4e1f862dd688..08e2e4bf8398 100644 --- 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 06761ed53747..8519b01f1acb 100644 --- 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 index 000000000000..6c40995fefb8 --- /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 -- 2.39.5