direct-io.hg

changeset 5642:e041c8e75863

I found several build issues, mostly related to building outside of the
source tree. Below/attached adjustments for these.
Signed-off-by: Jan Beulich <JBeulich@novell.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Jul 01 15:49:43 2005 +0000 (2005-07-01)
parents 374ff557a88f
children 430dc412e4c9
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/acpi/Makefile linux-2.6.11-xen-sparse/arch/xen/x86_64/pci/Makefile
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile	Fri Jul 01 15:48:47 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile	Fri Jul 01 15:49:43 2005 +0000
     1.3 @@ -84,12 +84,13 @@ SYSCFLAGS_vsyscall-syms.o = -r
     1.4  c-link	:= init_task.o
     1.5  s-link	:= vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o vsyscall.lds.o
     1.6  
     1.7 -$(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
     1.8 +$(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-obj-m) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
     1.9  	@ln -fsn $(srctree)/arch/i386/kernel/$(notdir $@) $@
    1.10  
    1.11  $(obj)/vsyscall-int80.S: $(obj)/vsyscall-sigreturn.S
    1.12  
    1.13  obj-y	+= $(c-obj-y) $(s-obj-y)
    1.14 +obj-m	+= $(c-obj-m)
    1.15  
    1.16 -clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link))
    1.17 +clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-m) $(c-obj-) $(c-link))
    1.18  clean-files += $(patsubst %.o,%.S,$(s-obj-y) $(s-obj-) $(s-link))
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile	Fri Jul 01 15:48:47 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/Makefile	Fri Jul 01 15:49:43 2005 +0000
     2.3 @@ -22,7 +22,7 @@ s-obj-y	:=
     2.4  #obj-$(CONFIG_X86_MCE)         += mce.o
     2.5  #obj-$(CONFIG_MTRR)		+= ../../i386/kernel/cpu/mtrr/
     2.6  obj-$(CONFIG_ACPI_BOOT)		+= acpi/
     2.7 -obj-$(CONFIG_X86_MSR)		+= msr.o
     2.8 +c-obj-$(CONFIG_X86_MSR)		+= msr.o
     2.9  obj-$(CONFIG_MICROCODE)		+= microcode.o
    2.10  obj-$(CONFIG_X86_CPUID)		+= cpuid.o
    2.11  #obj-$(CONFIG_SMP)		+= smp.o smpboot.o trampoline.o
    2.12 @@ -55,13 +55,14 @@ quirks-y			+= ../../../i386/kernel/quirk
    2.13  c-link	:= init_task.o
    2.14  s-link	:= vsyscall.o 
    2.15  
    2.16 -$(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
    2.17 -	ln -fsn $(srctree)/arch/x86_64/kernel/$(notdir $@) $@
    2.18 +$(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-obj-m) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
    2.19 +	@ln -fsn $(srctree)/arch/x86_64/kernel/$(notdir $@) $@
    2.20  
    2.21  $(patsubst %.o,$(obj)/%.c,$(i386-obj-y)):
    2.22 -	ln -fsn $(srctree)/arch/xen/i386/kernel/$(notdir $@) $@
    2.23 +	@ln -fsn $(srctree)/arch/xen/i386/kernel/$(notdir $@) $@
    2.24  
    2.25  obj-y	+= $(c-obj-y) $(s-obj-y) $(i386-obj-y)
    2.26 +obj-m	+= $(c-obj-m)
    2.27  
    2.28 -clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link) $(i386-obj-y))
    2.29 +clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-m) $(c-obj-) $(c-link) $(i386-obj-y))
    2.30  clean-files += $(patsubst %.o,%.S,$(s-obj-y) $(s-obj-) $(s-link))
     3.1 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/acpi/Makefile	Fri Jul 01 15:48:47 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/acpi/Makefile	Fri Jul 01 15:49:43 2005 +0000
     3.3 @@ -1,14 +1,18 @@
     3.4  i386-obj-$(CONFIG_ACPI_BOOT)		:= boot.o
     3.5  c-obj-$(CONFIG_X86_IO_APIC)	        := earlyquirk.o
     3.6 -c-obj-$(CONFIG_ACPI_SLEEP)	        += sleep.o wakeup.o
     3.7 +c-obj-$(CONFIG_ACPI_SLEEP)	        += sleep.o
     3.8 +s-obj-$(CONFIG_ACPI_SLEEP)	        += wakeup.o
     3.9  
    3.10  c-link                                  :=
    3.11  
    3.12  $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)):
    3.13  	@ln -fsn $(srctree)/arch/i386/kernel/acpi/$(notdir $@) $@
    3.14  
    3.15 +$(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
    3.16 +	@ln -fsn $(srctree)/arch/x86_64/kernel/acpi/$(notdir $@) $@
    3.17 +
    3.18  $(patsubst %.o,$(obj)/%.c,$(i386-obj-y)):
    3.19 -	ln -fsn $(srctree)/arch/xen/i386/kernel/acpi/$(notdir $@) $@
    3.20 +	@ln -fsn $(srctree)/arch/xen/i386/kernel/acpi/$(notdir $@) $@
    3.21  
    3.22  obj-y	+= $(c-obj-y) $(s-obj-y) $(i386-obj-y)
    3.23  
     4.1 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/pci/Makefile	Fri Jul 01 15:48:47 2005 +0000
     4.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/pci/Makefile	Fri Jul 01 15:49:43 2005 +0000
     4.3 @@ -8,34 +8,31 @@ CFLAGS	+= -Iarch/$(XENARCH)/pci
     4.4  
     4.5  CFLAGS += -Iarch/i386/pci
     4.6  
     4.7 -c-obj-y		:= i386.o
     4.8 -c-obj-y		+= fixup.o
     4.9 -c-obj-$(CONFIG_ACPI_PCI)	+= acpi.o
    4.10 -c-obj-y			+= legacy.o common.o
    4.11 -c-obj-$(CONFIG_PCI_DIRECT)+= direct.o
    4.12 +c-i386-obj-y		:= i386.o
    4.13 +c-i386-obj-y		+= fixup.o
    4.14 +c-i386-obj-$(CONFIG_ACPI_PCI)	+= acpi.o
    4.15 +c-i386-obj-y			+= legacy.o common.o
    4.16 +c-i386-obj-$(CONFIG_PCI_DIRECT)+= direct.o
    4.17  c-xen-obj-y		+= irq.o
    4.18  # mmconfig has a 64bit special
    4.19  c-obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
    4.20  
    4.21  c-obj-$(CONFIG_NUMA)	+= k8-bus.o
    4.22  
    4.23 -c-direct-y += ../../i386/pci/direct.o
    4.24 -c-acpi-y   += ../../i386/pci/acpi.o
    4.25 -c-legacy-y += ../../i386/pci/legacy.o
    4.26 -c-irq-y    += ../../i386/pci/irq.o
    4.27 -c-common-y += ../../i386/pci/common.o
    4.28 -c-fixup-y  += ../../i386/pci/fixup.o
    4.29 -c-i386-y  += ../../i386/pci/i386.o
    4.30 -
    4.31  c-link	:=
    4.32  
    4.33 -$(patsubst %.o,$(obj)/%.c,$(c-xen-obj-y) $(c-link)):
    4.34 +$(patsubst %.o,$(obj)/%.c,$(c-xen-obj-y)):
    4.35  	@ln -fsn $(srctree)/arch/xen/i386/pci/$(notdir $@) $@
    4.36  
    4.37  $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)):
    4.38 +	@ln -fsn $(srctree)/arch/x86_64/pci/$(notdir $@) $@
    4.39 +
    4.40 +$(patsubst %.o,$(obj)/%.c,$(c-i386-obj-y)):
    4.41  	@ln -fsn $(srctree)/arch/i386/pci/$(notdir $@) $@
    4.42  
    4.43 -obj-y	+= $(c-obj-y)
    4.44 +obj-y	+= $(c-i386-obj-y) $(c-obj-y)
    4.45  obj-y	+= $(c-xen-obj-y)
    4.46  
    4.47  clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link))
    4.48 +clean-files += $(patsubst %.o,%.c,$(c-i386-obj-y) $(c-i386-obj-))
    4.49 +clean-files += $(patsubst %.o,%.c,$(c-xen-obj-y) $(c-xen-obj-))