From 2cf67077e2ceed9254c7265e35b950ce8de2d013 Mon Sep 17 00:00:00 2001 From: Jian-Min Liu Date: Mon, 10 Jul 2023 09:35:24 +0000 Subject: [PATCH] Add compiler flag to avoid function re-definition Add CONFIG_TEGRA_VIRTUALIZATION with ack-5.15 build to avoid re-definition symbols when building tegra_hv.ko Bug 4187941 Change-Id: I64eb10264b527d59919fbe781198d227d0a21dda Signed-off-by: Jian-Min Liu Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2933664 GVS: Gerrit_Virtual_Submit Reviewed-by: svcacv Reviewed-by: Jonathan Hunter --- drivers/virt/tegra/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/virt/tegra/Makefile b/drivers/virt/tegra/Makefile index 47f1a11c..348d8f0a 100644 --- a/drivers/virt/tegra/Makefile +++ b/drivers/virt/tegra/Makefile @@ -8,6 +8,10 @@ LINUX_VERSION := $(shell expr $(VERSION) \* 256 + $(PATCHLEVEL)) LINUX_VERSION_6_2 := $(shell expr 6 \* 256 + 2) +ifneq ($(findstring ack_src,$(NV_BUILD_KERNEL_OPTIONS)),) +ccflags-$(CONFIG_TEGRA_VIRTUALIZATION) += -DCONFIG_TEGRA_VIRTUALIZATION +endif + # tegra_hv is currently broken for Linux v6.2 and so skip for Linux v6.2+ ifeq ($(shell test $(LINUX_VERSION) -lt $(LINUX_VERSION_6_2); echo $$?),0) ifdef CONFIG_TEGRA_VIRTUALIZATION