[2/2] mips: clean up kvm Makefile

Commit Message

Masahiro Yamada March 31, 2021, 3:06 p.m. UTC

You can use kvm-y instead of kvm-objs to create the composite module.
kvm-$(CONFIG_...) looks cleaner.

Signed-off-by: Masahiro Yamada <[e-mail]>
---

 arch/mips/kvm/Makefile | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

Comments

Thomas Bogendoerfer July 22, 2021, 10:09 a.m. UTC | #1

On Thu, Apr 01, 2021 at 12:06:57AM +0900, Masahiro Yamada wrote:
> You can use kvm-y instead of kvm-objs to create the composite module.
> kvm-$(CONFIG_...) looks cleaner.
> 
> Signed-off-by: Masahiro Yamada <[e-mail]>
> ---
> 
>  arch/mips/kvm/Makefile | 21 +++++++++------------
>  1 file changed, 9 insertions(+), 12 deletions(-)

applied to mips-next.

Thomas.

Patch

diff --git a/arch/mips/kvm/Makefile b/arch/mips/kvm/Makefile
index 7d42d624a7b9..6bc5da6faf0e 100644
--- a/arch/mips/kvm/Makefile
+++ b/arch/mips/kvm/Makefile
@@ -2,26 +2,23 @@ 
 # Makefile for KVM support for MIPS
 #
 
-common-objs-y = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o eventfd.o)
-
 ccflags-y += -Ivirt/kvm -Iarch/mips/kvm
 
-common-objs-$(CONFIG_CPU_HAS_MSA) += msa.o
+kvm-y := $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o eventfd.o)
+kvm-$(CONFIG_CPU_HAS_MSA) += msa.o
 
-kvm-objs := $(common-objs-y) mips.o emulate.o entry.o \
+kvm-y +=    mips.o emulate.o entry.o \
 	    interrupt.o stats.o commpage.o \
 	    fpu.o
-kvm-objs += hypcall.o
-kvm-objs += mmu.o
-ifdef CONFIG_CPU_LOONGSON64
-kvm-objs += loongson_ipi.o
-endif
+kvm-y += hypcall.o
+kvm-y += mmu.o
+kvm-$(CONFIG_CPU_LOONGSON64) += loongson_ipi.o
 
 ifdef CONFIG_KVM_MIPS_VZ
-kvm-objs		+= vz.o
+kvm-y		+= vz.o
 else
-kvm-objs		+= dyntrans.o
-kvm-objs		+= trap_emul.o
+kvm-y		+= dyntrans.o
+kvm-y		+= trap_emul.o
 endif
 obj-$(CONFIG_KVM)	+= kvm.o
 obj-y			+= callback.o tlb.o