From f36fdd5bafd2283ae09b6beddc819b8e45602bed Mon Sep 17 00:00:00 2001 From: Jian-Min Liu Date: Thu, 10 Aug 2023 15:22:11 +0000 Subject: [PATCH] Revert "Ensure virtualization macro are defined with ACK" This reverts commit 9a53ca82d003d644f8f8b5edce94d452f110335d. The CONFIG_TEGRA_VIRTUALIZATION defined in the top-level Makefile can be effective in the ACK build after refined make cmd. Bug 4187941 Bug 4223187 Signed-off-by: Jian-Min Liu Change-Id: Ide57f77b6d82770d9a1eeeb91c25e0b34d5911f0 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2954801 GVS: Gerrit_Virtual_Submit Reviewed-by: Laxman Dewangan --- drivers/misc/nvsciipc/Makefile | 4 ---- drivers/video/tegra/nvmap/Makefile | 4 ---- 2 files changed, 8 deletions(-) diff --git a/drivers/misc/nvsciipc/Makefile b/drivers/misc/nvsciipc/Makefile index 80dba553..9ce5cf81 100644 --- a/drivers/misc/nvsciipc/Makefile +++ b/drivers/misc/nvsciipc/Makefile @@ -7,8 +7,4 @@ ccflags-y += -I$(PWD) -ifneq ($(findstring ack_src,$(NV_BUILD_KERNEL_OPTIONS)),) -ccflags-$(CONFIG_TEGRA_VIRTUALIZATION) += -DCONFIG_TEGRA_VIRTUALIZATION -endif - obj-m += nvsciipc.o diff --git a/drivers/video/tegra/nvmap/Makefile b/drivers/video/tegra/nvmap/Makefile index a3c02904..d27e44fe 100644 --- a/drivers/video/tegra/nvmap/Makefile +++ b/drivers/video/tegra/nvmap/Makefile @@ -7,10 +7,6 @@ subdir-ccflags-y += -Werror include $(srctree.nvidia-oot)/drivers/video/tegra/nvmap/Makefile.memory.configs -ifneq ($(findstring ack_src,$(NV_BUILD_KERNEL_OPTIONS)),) -ccflags-$(CONFIG_TEGRA_VIRTUALIZATION) += -DCONFIG_TEGRA_VIRTUALIZATION -endif - ifeq ($(NVMAP_CONFIG), y) # Build NvMap only when NVMAP_CONFIG is set to y nvmap-y := nvmap_core.o \