ia64/xen-unstable

changeset 8737:1987bb42110a

Fix and cleanup how we build i386/x86_64 swiotlb.o.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Thu Feb 02 13:57:18 2006 +0000 (2006-02-02)
parents 8aeb417387ca
children 03382076472c
files linux-2.6-xen-sparse/arch/i386/kernel/Makefile linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile linux-2.6-xen-sparse/lib/Makefile
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/Makefile	Thu Feb 02 12:18:28 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/Makefile	Thu Feb 02 13:57:18 2006 +0000
     1.3 @@ -35,7 +35,6 @@ obj-$(CONFIG_HPET_TIMER) 	+= time_hpet.o
     1.4  obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
     1.5  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
     1.6  obj-$(CONFIG_SMP_ALTERNATIVES)	+= smpalts.o
     1.7 -obj-$(CONFIG_SWIOTLB)		+= swiotlb.o
     1.8  
     1.9  EXTRA_AFLAGS   := -traditional
    1.10  
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile	Thu Feb 02 12:18:28 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/Makefile	Thu Feb 02 13:57:18 2006 +0000
     2.3 @@ -51,8 +51,6 @@ msr-$(subst m,y,$(CONFIG_X86_MSR))  += .
     2.4  
     2.5  ifdef CONFIG_XEN
     2.6  time-y				+= ../../i386/kernel/time-xen.o
     2.7 -obj-$(CONFIG_SWIOTLB)		+= swiotlb.o
     2.8 -swiotlb-$(CONFIG_SWIOTLB)	:= ../../i386/kernel/swiotlb.o
     2.9  pci-dma-y			+= ../../i386/kernel/pci-dma-xen.o
    2.10  microcode-$(subst m,y,$(CONFIG_MICROCODE))  := ../../i386/kernel/microcode-xen.o
    2.11  quirks-y			:= ../../i386/kernel/quirks-xen.o
     3.1 --- a/linux-2.6-xen-sparse/lib/Makefile	Thu Feb 02 12:18:28 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/lib/Makefile	Thu Feb 02 13:57:18 2006 +0000
     3.3 @@ -44,10 +44,9 @@ obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o
     3.4  obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
     3.5  obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
     3.6  
     3.7 -ifeq ($(CONFIG_IA64),y)
     3.8  obj-$(CONFIG_SWIOTLB) += swiotlb.o
     3.9 -else ifneq ($(CONFIG_XEN),y)
    3.10 -obj-$(CONFIG_SWIOTLB) += swiotlb.o
    3.11 +ifneq ($(CONFIG_IA64),y)
    3.12 +swiotlb-$(CONFIG_XEN) := ../arch/i386/kernel/swiotlb.o
    3.13  endif
    3.14  
    3.15  hostprogs-y	:= gen_crc32table