diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index f32ab990..761490b5 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -3,7 +3,7 @@ * NVIDIA Tegra DRM GEM helper functions * * Copyright (C) 2012 Sascha Hauer, Pengutronix - * Copyright (C) 2013-2023 NVIDIA CORPORATION, All rights reserved. + * Copyright (C) 2013-2024 NVIDIA CORPORATION, All rights reserved. * * Based on the GEM/CMA helpers * @@ -24,7 +24,11 @@ #include "drm.h" #include "gem.h" +#if defined(NV_MODULE_IMPORT_NS_CALLS_STRINGIFY) MODULE_IMPORT_NS(DMA_BUF); +#else +MODULE_IMPORT_NS("DMA_BUF"); +#endif static unsigned int sg_dma_count_chunks(struct scatterlist *sgl, unsigned int nents) { 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 7bd7326e..88dda308 100644 --- a/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c +++ b/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c @@ -2385,6 +2385,10 @@ static void __exit capture_isp_exit(void) module_init(capture_isp_init); module_exit(capture_isp_exit); +#if defined(NV_MODULE_IMPORT_NS_CALLS_STRINGIFY) MODULE_IMPORT_NS(DMA_BUF); +#else +MODULE_IMPORT_NS("DMA_BUF"); +#endif MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("tegra capture-isp driver"); 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 e1e86c0d..9e2d48e1 100644 --- a/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c +++ b/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c @@ -1791,6 +1791,10 @@ static void __exit capture_vi_exit(void) module_init(capture_vi_init); module_exit(capture_vi_exit); +#if defined(NV_MODULE_IMPORT_NS_CALLS_STRINGIFY) MODULE_IMPORT_NS(DMA_BUF); +#else +MODULE_IMPORT_NS("DMA_BUF"); +#endif MODULE_DESCRIPTION("tegra fusa-capture driver"); MODULE_LICENSE("GPL"); diff --git a/drivers/misc/nvscic2c-pcie/vmap-pin.c b/drivers/misc/nvscic2c-pcie/vmap-pin.c index c23016d4..0780b010 100644 --- a/drivers/misc/nvscic2c-pcie/vmap-pin.c +++ b/drivers/misc/nvscic2c-pcie/vmap-pin.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #define pr_fmt(fmt) "nvscic2c-pcie: vmap-pin: " fmt @@ -380,4 +380,8 @@ err: return ret; } +#if defined(NV_MODULE_IMPORT_NS_CALLS_STRINGIFY) MODULE_IMPORT_NS(DMA_BUF); +#else +MODULE_IMPORT_NS("DMA_BUF"); +#endif diff --git a/drivers/net/ethernet/nvidia/nvethernet/sysfs.c b/drivers/net/ethernet/nvidia/nvethernet/sysfs.c index cef074c9..3cc74c83 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/sysfs.c +++ b/drivers/net/ethernet/nvidia/nvethernet/sysfs.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2019-2024, NVIDIA CORPORATION. All rights reserved */ +// SPDX-FileCopyrightText: Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include "ether_linux.h" #ifdef MACSEC_SUPPORT @@ -4179,4 +4179,8 @@ void ether_sysfs_unregister(struct ether_priv_data *pdata) MODULE_AUTHOR("NVIDIA Corporation"); MODULE_DESCRIPTION("Mac/Macsec Sysfs driver"); MODULE_LICENSE("GPL"); +#if defined(NV_MODULE_IMPORT_NS_CALLS_STRINGIFY) MODULE_IMPORT_NS(CRYPTO_INTERNAL); +#else +MODULE_IMPORT_NS("CRYPTO_INTERNAL"); +#endif diff --git a/drivers/platform/tegra/tegra-fsicom.c b/drivers/platform/tegra/tegra-fsicom.c index 52cf4a7a..12edda6e 100644 --- a/drivers/platform/tegra/tegra-fsicom.c +++ b/drivers/platform/tegra/tegra-fsicom.c @@ -550,7 +550,11 @@ static struct platform_driver fsicom_client = { module_platform_driver(fsicom_client); +#if defined(NV_MODULE_IMPORT_NS_CALLS_STRINGIFY) MODULE_IMPORT_NS(DMA_BUF); +#else +MODULE_IMPORT_NS("DMA_BUF"); +#endif MODULE_DESCRIPTION("FSI-CCPLEX-COM driver"); MODULE_AUTHOR("Prashant Shaw "); MODULE_LICENSE("GPL v2"); diff --git a/drivers/video/tegra/host/nvdla/nvdla.c b/drivers/video/tegra/host/nvdla/nvdla.c index faa258ff..9d9c2c6e 100644 --- a/drivers/video/tegra/host/nvdla/nvdla.c +++ b/drivers/video/tegra/host/nvdla/nvdla.c @@ -1372,6 +1372,10 @@ static void __exit nvdla_exit(void) module_exit(nvdla_exit); #endif +#if defined(NV_MODULE_IMPORT_NS_CALLS_STRINGIFY) MODULE_IMPORT_NS(DMA_BUF); +#else +MODULE_IMPORT_NS("DMA_BUF"); +#endif MODULE_AUTHOR("Shridhar Rasal "); MODULE_LICENSE("GPL v2"); diff --git a/drivers/video/tegra/host/pva/pva.c b/drivers/video/tegra/host/pva/pva.c index 12e96d64..3fc3d890 100644 --- a/drivers/video/tegra/host/pva/pva.c +++ b/drivers/video/tegra/host/pva/pva.c @@ -1826,5 +1826,9 @@ static void __exit nvpva_exit(void) module_exit(nvpva_exit); #endif +#if defined(NV_MODULE_IMPORT_NS_CALLS_STRINGIFY) MODULE_IMPORT_NS(DMA_BUF); +#else +MODULE_IMPORT_NS("DMA_BUF"); +#endif MODULE_LICENSE("GPL v2"); diff --git a/drivers/video/tegra/nvmap/nvmap_init.c b/drivers/video/tegra/nvmap/nvmap_init.c index 6ccabf34..cbc4b7ab 100644 --- a/drivers/video/tegra/nvmap/nvmap_init.c +++ b/drivers/video/tegra/nvmap/nvmap_init.c @@ -483,7 +483,11 @@ static void __exit nvmap_exit_driver(void) nvmap_dev = NULL; } module_exit(nvmap_exit_driver); +#if defined(NV_MODULE_IMPORT_NS_CALLS_STRINGIFY) MODULE_IMPORT_NS(DMA_BUF); +#else +MODULE_IMPORT_NS("DMA_BUF"); +#endif MODULE_DESCRIPTION("NvMap: Nvidia Tegra Memory Management Driver"); MODULE_AUTHOR("Ketan Patil "); MODULE_AUTHOR("Ashish Mhetre "); diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile index 80b77d85..d9086368 100644 --- a/scripts/conftest/Makefile +++ b/scripts/conftest/Makefile @@ -150,7 +150,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += kthread_complete_and_exit NV_CONFTEST_FUNCTION_COMPILE_TESTS += mii_bus_struct_has_read_c45 NV_CONFTEST_FUNCTION_COMPILE_TESTS += mii_bus_struct_has_write_c45 NV_CONFTEST_FUNCTION_COMPILE_TESTS += media_entity_remote_pad -NV_CONFTEST_FUNCTION_COMPILE_TESTS += module_import_ns_macro +NV_CONFTEST_FUNCTION_COMPILE_TESTS += module_import_ns_calls_stringify NV_CONFTEST_FUNCTION_COMPILE_TESTS += msi_get_virq NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_set_tso_max_size NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_napi_add_weight diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh index 5fc173f9..e7391f7a 100755 --- a/scripts/conftest/conftest.sh +++ b/scripts/conftest/conftest.sh @@ -7633,18 +7633,22 @@ compile_test() { compile_check_conftest "$CODE" "NV_MII_BUS_STRUCT_HAS_WRITE_C45" "" "types" ;; - module_import_ns_macro) + module_import_ns_calls_stringify) # - # Determine if the MODULE_IMPORT_NS macro present. + # Determine if the MODULE_IMPORT_NS macro takes a string literal as + # an argument. + # + # Commit cdd30ebb1b9f ("module: Convert symbol namespace to string + # literal") updated the symbol namespace macros to take a string + # literal as an argument and removes the call to __stringify from + # within the macro for Linux v6.13. # - # Added in commit 80140a81f7f833 ("module.h: simplify MODULE_IMPORT_NS") - # in Linux 5.18. CODE=" #include MODULE_IMPORT_NS(DMA_BUF); " - compile_check_conftest "$CODE" "NV_MODULE_IMPORT_NS_PRESENT" "" "types" + compile_check_conftest "$CODE" "NV_MODULE_IMPORT_NS_CALLS_STRINGIFY" "" "types" ;; no_llseek)