---

yaml --- r: 220528 b: refs/heads/master c: 329b84e h: refs/heads/master v: v3
git-mirror · Oct 27, 2010 · 35f8f7f · 35f8f7f
1 parent f5274e6
commit 35f8f7f
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → trunk/arch/x86/platform/uv/bios_uv.c b/trunk/arch/x86/kernel/bios_uv.c → trunk/arch/x86/platform/uv/bios_uv.c
diff --git a/trunk/arch/x86/kernel/tlb_uv.c → trunk/arch/x86/platform/uv/tlb_uv.c b/trunk/arch/x86/kernel/tlb_uv.c → trunk/arch/x86/platform/uv/tlb_uv.c
diff --git a/trunk/arch/x86/kernel/uv_irq.c → trunk/arch/x86/platform/uv/uv_irq.c b/trunk/arch/x86/kernel/uv_irq.c → trunk/arch/x86/platform/uv/uv_irq.c
diff --git a/trunk/arch/x86/kernel/uv_sysfs.c → trunk/arch/x86/platform/uv/uv_sysfs.c b/trunk/arch/x86/kernel/uv_sysfs.c → trunk/arch/x86/platform/uv/uv_sysfs.c
diff --git a/trunk/arch/x86/kernel/uv_time.c → trunk/arch/x86/platform/uv/uv_time.c b/trunk/arch/x86/kernel/uv_time.c → trunk/arch/x86/platform/uv/uv_time.c
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o