Skip to contentSkip to conversation

ia64: simplify esi object addition in Makefile

PATCH In review Masahiro Yamada 2 participants 2 messages Sep 29, 2022 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ia64: simplify esi object addition in Makefile

CONFIG_IA64_ESI is a bool option. I do not know why the Makefile was written like this, but this should not have any functional change.

---

 arch/ia64/kernel/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/ia64/kernel/Makefile +1 -4
index 4a1fcb121dda..ae9ff07de4ab 100644
@@ -34,10 +34,7 @@ mca_recovery-y			+= mca_drv.o mca_drv_asm.o
 obj-$(CONFIG_IA64_MC_ERR_INJECT)+= err_inject.o
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 
-obj-$(CONFIG_IA64_ESI)		+= esi.o
-ifneq ($(CONFIG_IA64_ESI),)
-obj-y				+= esi_stub.o	# must be in kernel proper
-endif
+obj-$(CONFIG_IA64_ESI)		+= esi.o esi_stub.o # must be in kernel proper
 obj-$(CONFIG_INTEL_IOMMU)	+= pci-dma.o
 
 obj-$(CONFIG_ELF_CORE)		+= elfcore.o
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 27 lines · Masahiro Yamada

CONFIG_IA64_ESI is a bool option. I do not know why the Makefile was written like this, but this should not have any functional change.

---

 arch/ia64/kernel/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/ia64/kernel/Makefile +1 -4
index 4a1fcb121dda..ae9ff07de4ab 100644
@@ -34,10 +34,7 @@ mca_recovery-y			+= mca_drv.o mca_drv_asm.o
 obj-$(CONFIG_IA64_MC_ERR_INJECT)+= err_inject.o
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 
-obj-$(CONFIG_IA64_ESI)		+= esi.o
-ifneq ($(CONFIG_IA64_ESI),)
-obj-y				+= esi_stub.o	# must be in kernel proper
-endif
+obj-$(CONFIG_IA64_ESI)		+= esi.o esi_stub.o # must be in kernel proper
 obj-$(CONFIG_INTEL_IOMMU)	+= pci-dma.o
 
 obj-$(CONFIG_ELF_CORE)		+= elfcore.o
Signature · 1 line
2.34.1