From cb8b9f5a53f23a5d03b9444627a1ce6418abd12b Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Wed, 3 Apr 2024 14:34:07 +0100 Subject: [PATCH] drivers: Fix missing vmalloc.h for Linux v6.10 Upstream commit 690da22dbfa8 ("asm-generic/io.h: kill vmalloc.h dependency") removed the vmalloc.h header file from io.h and this breaks building various drivers with the latest -next kernels. Fix this by ensuring vmalloc.h is included and in most cases slab is not actually needed and so remove this where possible. Note that it is fine to make this change for all current supported kernels. Bug 4593750 Change-Id: I003d1302bda226d356467e6ede99949b2716940a Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3141984 Reviewed-by: Brad Griffis GVS: buildbot_gerritrpt --- .../block/tegra_virt_storage/tegra_hv_mmc.c | 8 +++----- .../block/tegra_virt_storage/tegra_hv_ufs.c | 8 +++----- drivers/gpu/drm/tegra/fb.c | 1 + drivers/gpu/drm/tegra/gem.c | 1 + .../tegra/camera/fusa-capture/capture-isp.c | 4 ++-- .../camera/fusa-capture/capture-vi-channel.c | 2 +- .../tegra/camera/fusa-capture/capture-vi.c | 2 +- .../endpoint/functions/pci-epf-tegra-vnet.c | 19 +++---------------- drivers/video/tegra/host/nvdla/dla_queue.c | 4 ++-- 9 files changed, 17 insertions(+), 32 deletions(-) diff --git a/drivers/block/tegra_virt_storage/tegra_hv_mmc.c b/drivers/block/tegra_virt_storage/tegra_hv_mmc.c index a87d268b..102c46e3 100644 --- a/drivers/block/tegra_virt_storage/tegra_hv_mmc.c +++ b/drivers/block/tegra_virt_storage/tegra_hv_mmc.c @@ -1,10 +1,8 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. - */ +// SPDX-License-Identifier: GPL-2.0-only +// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include /* printk() */ -#include /* kmalloc() */ +#include /* kmalloc() */ #include /* everything... */ #include /* error codes */ #include /* O_ACCMODE */ diff --git a/drivers/block/tegra_virt_storage/tegra_hv_ufs.c b/drivers/block/tegra_virt_storage/tegra_hv_ufs.c index 75da097e..8c88cedc 100644 --- a/drivers/block/tegra_virt_storage/tegra_hv_ufs.c +++ b/drivers/block/tegra_virt_storage/tegra_hv_ufs.c @@ -1,9 +1,7 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved. - */ +// SPDX-License-Identifier: GPL-2.0-only +// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. -#include /* kmalloc() */ +#include /* kmalloc() */ #include /* error codes */ #include /* For msleep and usleep_range */ #include diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c index 65268404..a5e254a3 100644 --- a/drivers/gpu/drm/tegra/fb.c +++ b/drivers/gpu/drm/tegra/fb.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 1e1a2575..f32ab990 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c b/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c index 717cf76a..b3300cbe 100644 --- a/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c +++ b/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -// Copyright (c) 2017-2023 NVIDIA Corporation. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. /** * @file drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/media/platform/tegra/camera/fusa-capture/capture-vi-channel.c b/drivers/media/platform/tegra/camera/fusa-capture/capture-vi-channel.c index a6f029b3..b5487bf2 100644 --- a/drivers/media/platform/tegra/camera/fusa-capture/capture-vi-channel.c +++ b/drivers/media/platform/tegra/camera/fusa-capture/capture-vi-channel.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c b/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c index 6d681c1d..57b892f1 100644 --- a/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c +++ b/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/pci/endpoint/functions/pci-epf-tegra-vnet.c b/drivers/pci/endpoint/functions/pci-epf-tegra-vnet.c index a58ff29d..02e3917c 100644 --- a/drivers/pci/endpoint/functions/pci-epf-tegra-vnet.c +++ b/drivers/pci/endpoint/functions/pci-epf-tegra-vnet.c @@ -1,19 +1,5 @@ -// SPDX-License-Identifier: GPL-2.0 -/* SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. - * 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 . - */ +// SPDX-License-Identifier: GPL-2.0-only +// SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -26,6 +12,7 @@ #include #include #include +#include #include #if (LINUX_VERSION_CODE > KERNEL_VERSION(5, 14, 0)) diff --git a/drivers/video/tegra/host/nvdla/dla_queue.c b/drivers/video/tegra/host/nvdla/dla_queue.c index c1e62970..9ad2b445 100644 --- a/drivers/video/tegra/host/nvdla/dla_queue.c +++ b/drivers/video/tegra/host/nvdla/dla_queue.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only +// SPDX-FileCopyrightText: Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. /* - * Copyright (c) 2019-2023, NVIDIA Corporation. All rights reserved. - * * NVDLA queue management */ @@ -10,6 +9,7 @@ #include #include #include +#include #include #include