Mailing List Archive

# HG changeset patch
# User cl349@firebug.cl.cam.ac.uk
# Node ID 1987bb42110a44a32c28ea99a5398a96515dcce7
# Parent 8aeb417387caa0dc0e6d0b1bc733a3303fcfd965
Fix and cleanup how we build i386/x86_64 swiotlb.o.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff -r 8aeb417387ca -r 1987bb42110a linux-2.6-xen-sparse/arch/i386/kernel/Makefile
--- a/linux-2.6-xen-sparse/arch/i386/kernel/Makefile Thu Feb 2 11:18:28 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/Makefile Thu Feb 2 13:57:18 2006
@@ -35,7 +35,6 @@
obj-$(CONFIG_EFI) += efi.o efi_stub.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_SMP_ALTERNATIVES) += smpalts.o
-obj-$(CONFIG_SWIOTLB) += swiotlb.o

EXTRA_AFLAGS := -traditional

diff -r 8aeb417387ca -r 1987bb42110a linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile Thu Feb 2 11:18:28 2006
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile Thu Feb 2 13:57:18 2006
@@ -51,8 +51,6 @@

ifdef CONFIG_XEN
time-y += ../../i386/kernel/time-xen.o
-obj-$(CONFIG_SWIOTLB) += swiotlb.o
-swiotlb-$(CONFIG_SWIOTLB) := ../../i386/kernel/swiotlb.o
pci-dma-y += ../../i386/kernel/pci-dma-xen.o
microcode-$(subst m,y,$(CONFIG_MICROCODE)) := ../../i386/kernel/microcode-xen.o
quirks-y := ../../i386/kernel/quirks-xen.o
diff -r 8aeb417387ca -r 1987bb42110a linux-2.6-xen-sparse/lib/Makefile
--- a/linux-2.6-xen-sparse/lib/Makefile Thu Feb 2 11:18:28 2006
+++ b/linux-2.6-xen-sparse/lib/Makefile Thu Feb 2 13:57:18 2006
@@ -44,10 +44,9 @@
obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o

-ifeq ($(CONFIG_IA64),y)
obj-$(CONFIG_SWIOTLB) += swiotlb.o
-else ifneq ($(CONFIG_XEN),y)
-obj-$(CONFIG_SWIOTLB) += swiotlb.o
+ifneq ($(CONFIG_IA64),y)
+swiotlb-$(CONFIG_XEN) := ../arch/i386/kernel/swiotlb.o
endif

hostprogs-y := gen_crc32table

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog