From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-mips@linux-mips.org
Cc: Masahiro Yamada <masahiroy@kernel.org>,
Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>,
Huacai Chen <chenhuacai@kernel.org>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mips@vger.kernel.org
Subject: [PATCH 2/2] mips: clean up kvm Makefile
Date: Thu, 1 Apr 2021 00:06:57 +0900 [thread overview]
Message-ID: <20210331150658.38919-2-masahiroy@kernel.org> (raw)
In-Reply-To: <20210331150658.38919-1-masahiroy@kernel.org>
You can use kvm-y instead of kvm-objs to create the composite module.
kvm-$(CONFIG_...) looks cleaner.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
arch/mips/kvm/Makefile | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
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
--
2.27.0
next prev parent reply other threads:[~2021-03-31 15:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-31 15:06 [PATCH 1/2] mips: replace deprecated EXTRA_CFLAGS with ccflags-y Masahiro Yamada
2021-03-31 15:06 ` Masahiro Yamada [this message]
2021-07-22 10:09 ` [PATCH 2/2] mips: clean up kvm Makefile Thomas Bogendoerfer
2021-07-22 10:09 ` [PATCH 1/2] mips: replace deprecated EXTRA_CFLAGS with ccflags-y Thomas Bogendoerfer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210331150658.38919-2-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=chenhuacai@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-mips@vger.kernel.org \
--cc=tsbogend@alpha.franken.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.