KVM: arm/arm64: Prefix header search paths with $(srctree)/ (05277f36) · Commits · 戴 / test

Currently, the Kbuild core manipulates header search paths in a crazy way [1]. To fix this mess, I want all Makefiles to add explicit $(srctree)/ to the search paths in the srctree. Some Makefiles are already written in that way, but not all. The goal of this work is to make the notation consistent, and finally get rid of the gross hacks. Having whitespaces after -I does not matter since commit ("kbuild: do not drop -I without parameter"). [1]: https://patchwork.kernel.org/patch/9632347/ Acked-by:

Christoffer Dall <christoffer.dall@arm.com> Signed-off-by:

Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by:

Marc Zyngier <marc.zyngier@arm.com>

arch/arm/kvm/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ ifeq ($(plus_virt),+virt)
	plus_virt_def := -DREQUIRES_VIRT=1		plus_virt_def := -DREQUIRES_VIRT=1
	endif		endif

	ccflags-y += -Iarch/arm/kvm -Ivirt/kvm/arm/vgic		ccflags-y += -I $(srctree)/$(src) -I $(srctree)/virt/kvm/arm/vgic
	CFLAGS_arm.o := $(plus_virt_def)		CFLAGS_arm.o := $(plus_virt_def)

	AFLAGS_init.o := -Wa,-march=armv7-a$(plus_virt)		AFLAGS_init.o := -Wa,-march=armv7-a$(plus_virt)

arch/arm64/kvm/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,7 @@
	# Makefile for Kernel-based Virtual Machine module		# Makefile for Kernel-based Virtual Machine module
	#		#

	ccflags-y += -Iarch/arm64/kvm -Ivirt/kvm/arm/vgic		ccflags-y += -I $(srctree)/$(src) -I $(srctree)/virt/kvm/arm/vgic

	KVM=../../../virt/kvm		KVM=../../../virt/kvm

Admin message