diff --git a/drivers/video/tegra/nvmap/Makefile b/drivers/video/tegra/nvmap/Makefile
index 6399bc0d..d18d535d 100644
--- a/drivers/video/tegra/nvmap/Makefile
+++ b/drivers/video/tegra/nvmap/Makefile
@@ -1,2 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
+
+# NOTE: Do not change or add anything in this makefile.
+# The source code and makefile rules are copied from the
+# kernel/nvidia/drivers/video/tegra/nvmap. This file is
+# just place-holder for empty makefile to avoid any build
+# issue when copy is not done from command line and building
+# the tree independent of source copy.
diff --git a/kernel-src-files-copy-list.txt b/kernel-src-files-copy-list.txt
index 3559d327..5c65da05 100644
--- a/kernel-src-files-copy-list.txt
+++ b/kernel-src-files-copy-list.txt
@@ -3,3 +3,10 @@ copy_dir nvidia/drivers/misc/nvsciipc drivers/misc/nvsciipc
 copy_file nvidia/include/linux/nvscierror.h include/linux/nvscierror.h
 copy_file nvidia/include/linux/nvsciipc_interface.h include/linux/nvsciipc_interface.h
 copy_file nvidia/include/uapi/linux/nvsciipc_ioctl.h include/uapi/linux/nvsciipc_ioctl.h
+
+# Files/directories for the nvmap module
+copy_dir nvidia/drivers/video/tegra/nvmap drivers/video/tegra/nvmap
+copy_file nvidia/include/linux/nvmap.h include/linux/nvmap.h
+copy_file nvidia/include/linux/nvmap_t19x.h include/linux/nvmap_t19x.h
+copy_file nvidia/include/trace/events/nvmap.h include/trace/events/nvmap.h
+copy_file nvidia/include/uapi/linux/nvmap.h include/uapi/linux/nvmap.h