diff --git a/drivers/video/tegra/virt/tegra_gr_comm.c b/drivers/video/tegra/virt/tegra_gr_comm.c
index 69ec7743..d34693ae 100644
--- a/drivers/video/tegra/virt/tegra_gr_comm.c
+++ b/drivers/video/tegra/virt/tegra_gr_comm.c
@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2013-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+
 /*
- * Copyright (c) 2013-2023, NVIDIA Corporation. All rights reserved.
- *
  * Tegra Graphics Virtualization Communication Framework
  */
 
+#include <nvidia/conftest.h>
+
 #include <linux/mutex.h>
 #include <linux/semaphore.h>
 #include <linux/list.h>
@@ -361,7 +363,11 @@ int tegra_gr_comm_init(struct device *dev, struct device_node *dn, u32 elems,
 		queue->element_cache =
 			kmem_cache_create(name,
 				sizeof(struct gr_comm_element) + size, 0,
+#if defined(NV_SLAB_MEM_SPREAD)
 				SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, NULL);
+#else
+				SLAB_RECLAIM_ACCOUNT, NULL);
+#endif
 
 		if (!queue->element_cache) {
 			ret = -ENOMEM;
diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile
index 0a021488..295ddbf1 100644
--- a/scripts/conftest/Makefile
+++ b/scripts/conftest/Makefile
@@ -148,6 +148,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_epf_driver_struct_probe_has_id_arg
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_epc_irq_type_enum_present
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += register_shrinker_has_fmt_arg
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += shrinker_alloc
+NV_CONFTEST_FUNCTION_COMPILE_TESTS += slab_mem_spread
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += snd_soc_card_jack_new_has_no_snd_soc_jack_pins
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += snd_soc_component_driver_struct_has_non_legacy_dai_naming
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += snd_soc_dai_link_struct_has_c2c_params_arg
diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh
index 62604cf1..e5b86815 100755
--- a/scripts/conftest/conftest.sh
+++ b/scripts/conftest/conftest.sh
@@ -7407,6 +7407,23 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_SHRINKER_ALLOC_PRESENT" "" "functions"
         ;;
 
+        slab_mem_spread)
+            #
+            # Determine if SLAB_MEM_SPREAD is defined.
+            #
+            # Commit f88c3fb81c4b ("mm, slab: remove last vestiges of
+            # SLAB_MEM_SPREAD") removed the definition SLAB_MEM_SPREAD in
+            # Linux v6.9. This definition is no longer supported and can
+            # be removed for v6.9+ kernels.
+            CODE="
+            #include <linux/slab.h>
+            void conftest_slab_mem_spread(void) {
+                slab_flags_t flags = SLAB_MEM_SPREAD;
+            }"
+
+            compile_check_conftest "$CODE" "NV_SLAB_MEM_SPREAD" "" "functions"
+        ;;
+
         snd_soc_card_jack_new_has_no_snd_soc_jack_pins)
             #
             # Determine if the function snd_soc_card_jack_new() has 'pins' and