Skip to contentSkip to conversation

cleanup arch/x86/kvm/Makefile

PATCH In review Christoph Hellwig 2 participants 4 messages May 18, 2009

Subsystems (3)
x86 KVM KVM x86
lore
Share & tools
lore

Christoph Hellwig

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
arch/x86/kvm/Makefile +13 -19
Index: linux-2.6/arch/x86/kvm/Makefile
===================================================================
@@ -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
#1 lore raw
Quoted 5 lines · Christoph Hellwig

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.

arch/x86/kvm/Makefile line 17

Quoted 3 lines
arch/x86/kvm/Makefile +0 -2
-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.

Signature · 1 line
error compiling committee.c: too many arguments to function
author
#2 lore raw
Quoted 7 lines · Avi Kivity
Quoted 5 lines · Christoph Hellwig

Use proper foo-y style list additions to cleanup all the conditionals, move module selection after compound object selection and remove the superflous comment.

Quoted 7 lines

I think you're patching the wrong tree.

arch/x86/kvm/Makefile line 17

Quoted 3 lines
arch/x86/kvm/Makefile +0 -2
-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.

#3 lore raw
Quoted 4 lines · Christoph Hellwig
Quoted 2 lines

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.

Signature · 1 line
error compiling committee.c: too many arguments to function