From 6d8106348a9d2e4c6dd66d108734a9d7dab3c07f Mon Sep 17 00:00:00 2001
From: Jon Hunter <jonathanh@nvidia.com>
Date: Wed, 3 Apr 2024 14:57:15 +0100
Subject: [PATCH] gpu: nvgpu: Fix missing vmalloc.h

Upstream commit 690da22dbfa8 ("asm-generic/io.h: kill vmalloc.h
dependency") removed the vmalloc.h header file from io.h and this causes
the NVGPU driver build to fail with the latest -next kernels. Fix this
by ensuring vmalloc.h is included. Note that it is fine to make this
change for all current supported kernels.

Bug 4593750

Change-Id: I426a4ead6607f0f41f31ce635f4d83222fa57b07
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/3111678
(cherry picked from commit 5c166b94c93ee7bdcff5c97a3e8316864e82cc70)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/3142060
Reviewed-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
---
 drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c | 18 +++---------------
 drivers/gpu/nvgpu/os/linux/linux-dma.c        |  3 ++-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c b/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c
index 8a04392ec..b056a8b5a 100644
--- a/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c
+++ b/drivers/gpu/nvgpu/os/linux/fecs_trace_linux.c
@@ -1,23 +1,11 @@
-/*
- * Copyright (c) 2016-2020, NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 #include <linux/wait.h>
 #include <linux/ktime.h>
 #include <linux/uaccess.h>
 #include <linux/poll.h>
+#include <linux/vmalloc.h>
 #include <nvgpu/trace.h>
 #include <uapi/linux/nvgpu.h>
 #include <nvgpu/kmem.h>
diff --git a/drivers/gpu/nvgpu/os/linux/linux-dma.c b/drivers/gpu/nvgpu/os/linux/linux-dma.c
index 28fb3890d..fbfad8aa6 100644
--- a/drivers/gpu/nvgpu/os/linux/linux-dma.c
+++ b/drivers/gpu/nvgpu/os/linux/linux-dma.c
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-only
-// SPDX-FileCopyrightText: Copyright (c) 2017-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/iommu.h>
+#include <linux/vmalloc.h>
 
 #include <nvgpu/log.h>
 #include <nvgpu/dma.h>