diff --git a/drivers/video/tegra/nvmap/nvmap_pp.c b/drivers/video/tegra/nvmap/nvmap_pp.c
index 7568c81c..e325cd41 100644
--- a/drivers/video/tegra/nvmap/nvmap_pp.c
+++ b/drivers/video/tegra/nvmap/nvmap_pp.c
@@ -7,6 +7,8 @@
 
 #define pr_fmt(fmt) "%s: " fmt, __func__
 
+#include <nvidia/conftest.h>
+
 #include <linux/kernel.h>
 #include <linux/vmalloc.h>
 #include <linux/moduleparam.h>
@@ -769,7 +771,7 @@ int nvmap_page_pool_init(struct nvmap_device *dev)
 					    NULL, "nvmap-bz");
 	if (IS_ERR(background_allocator))
 		goto fail;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)
+#if defined(NV_REGISTER_SHRINKER_HAS_FMT_ARG) /* Linux v6.0 */
 	register_shrinker(&nvmap_page_pool_shrinker, "nvmap_pp_shrinker");
 #else
 	register_shrinker(&nvmap_page_pool_shrinker);
diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile
index 28b83344..582242a0 100644
--- a/scripts/conftest/Makefile
+++ b/scripts/conftest/Makefile
@@ -99,6 +99,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fb_helper_struct_has_info_arg
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_mode_config_struct_has_fb_base_arg
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += iio_dev_opaque_has_mlock
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += iommu_map_has_gfp_arg
+NV_CONFTEST_FUNCTION_COMPILE_TESTS += register_shrinker_has_fmt_arg
 NV_CONFTEST_GENERIC_COMPILE_TESTS ?=
 NV_CONFTEST_MACRO_COMPILE_TESTS ?=
 NV_CONFTEST_SYMBOL_COMPILE_TESTS ?=
diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh
index a61fea28..4d5015d7 100755
--- a/scripts/conftest/conftest.sh
+++ b/scripts/conftest/conftest.sh
@@ -6505,6 +6505,26 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_IIO_DEV_OPAQUE_HAS_LOCK" "" "types"
         ;;
 
+        register_shrinker_has_fmt_arg)
+            #
+            # Determine if the 'register_shrinker' function
+            # has the 'fmt' argument.
+            #
+            # Commit e33c267ab70d ("mm: shrinkers: provide shrinkers with
+            # names") added a 'fmt' argument to the register_shrinker()
+            # function in Linux v6.0.
+            #
+            CODE="
+	    #include <linux/atomic.h>
+            #include <linux/compiler_attributes.h>
+            #include <linux/shrinker.h>
+            int conftest_register_shrinker_has_fmt_arg(struct shrinker *s, const char *name) {
+                    return register_shrinker(s, name);
+            }"
+
+            compile_check_conftest "$CODE" "NV_REGISTER_SHRINKER_HAS_FMT_ARG" "" "types"
+        ;;
+
         # When adding a new conftest entry, please use the correct format for
         # specifying the relevant upstream Linux kernel commit.
         #