[PATCH] cleanup arch/x86/kvm/Makefile
Use proper foo-y style list additions to cleanup all the conditionals, move module selection after compound object selection and remove the superflous comment. Signed-off-by: Christoph Hellwig h...@lst.de Index: linux-2.6/arch/x86/kvm/Makefile === --- linux-2.6.orig/arch/x86/kvm/Makefile2009-05-18 13:18:03.783784453 +0200 +++ linux-2.6/arch/x86/kvm/Makefile 2009-05-18 14:13:27.983658979 +0200 @@ -1,22 +1,16 @@ -# -# Makefile for Kernel-based Virtual Machine module -# - -common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ -coalesced_mmio.o irq_comm.o) -ifeq ($(CONFIG_KVM_TRACE),y) -common-objs += $(addprefix ../../../virt/kvm/, kvm_trace.o) -endif -ifeq ($(CONFIG_IOMMU_API),y) -common-objs += $(addprefix ../../../virt/kvm/, iommu.o) -endif EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm -kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ - i8254.o -obj-$(CONFIG_KVM) += kvm.o -kvm-intel-objs = vmx.o -obj-$(CONFIG_KVM_INTEL) += kvm-intel.o -kvm-amd-objs = svm.o -obj-$(CONFIG_KVM_AMD) += kvm-amd.o +kvm-y += $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ + coalesced_mmio.o irq_comm.o) +kvm-$(CONFIG_KVM_TRACE)+= $(addprefix ../../../virt/kvm/, kvm_trace.o) +kvm-$(CONFIG_IOMMU_API)+= $(addprefix ../../../virt/kvm/, iommu.o) + +kvm-y += x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ + i8254.o +kvm-intel-y+= vmx.o +kvm-amd-y += svm.o + +obj-$(CONFIG_KVM) += kvm.o +obj-$(CONFIG_KVM_INTEL)+= kvm-intel.o +obj-$(CONFIG_KVM_AMD) += kvm-amd.o -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] cleanup arch/x86/kvm/Makefile
Christoph Hellwig wrote: Use proper foo-y style list additions to cleanup all the conditionals, move module selection after compound object selection and remove the superflous comment. I think you're patching the wrong tree. -kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ - i8254.o I have a timer.o here, for example. -- error compiling committee.c: too many arguments to function -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] cleanup arch/x86/kvm/Makefile
On Mon, May 18, 2009 at 05:05:58PM +0300, Avi Kivity wrote: Christoph Hellwig wrote: Use proper foo-y style list additions to cleanup all the conditionals, move module selection after compound object selection and remove the superflous comment. I think you're patching the wrong tree. -kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \ -i8254.o I have a timer.o here, for example. It's current mainline as of today. -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] cleanup arch/x86/kvm/Makefile
Christoph Hellwig wrote: I have a timer.o here, for example. It's current mainline as of today We're on a different today then. But I see the patch that changed it, it only added timer.o, so I'll adjust the patch. -- error compiling committee.c: too many arguments to function -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
