diff --git a/drivers/cpuidle/cpuidle-debugfs.c b/drivers/cpuidle/cpuidle-debugfs.c
index 31c8edf9..1039b18a 100644
--- a/drivers/cpuidle/cpuidle-debugfs.c
+++ b/drivers/cpuidle/cpuidle-debugfs.c
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved.
- *
  * Module to force cpuidle states through debugfs files.
- *
  */
+#include <nvidia/conftest.h>
+
 #include <linux/module.h>
 #include <linux/irq.h>
 #include <linux/irqdesc.h>
@@ -26,9 +26,16 @@ static void suspend_all_device_irqs(void)
 {
 	struct irq_data *data;
 	struct irq_desc *desc;
+	unsigned int nirqs;
 	int irq;
 
-	for (irq = 0, data = irq_get_irq_data(irq); irq < nr_irqs;
+#if defined(NV_IRQ_GET_NR_IRQS_PRESENT) /* Linux v6.13 */
+	nirqs = irq_get_nr_irqs();
+#else
+	nirqs = nr_irqs;
+#endif
+
+	for (irq = 0, data = irq_get_irq_data(irq); irq < nirqs;
 			irq++, data = irq_get_irq_data(irq)) {
 		if (!data)
 			continue;
@@ -44,9 +51,16 @@ static void resume_all_device_irqs(void)
 {
 	struct irq_data *data;
 	struct irq_desc *desc;
+	unsigned int nirqs;
 	int irq;
 
-	for (irq = 0, data = irq_get_irq_data(irq); irq < nr_irqs;
+#if defined(NV_IRQ_GET_NR_IRQS_PRESENT)
+	nirqs = irq_get_nr_irqs();
+#else
+	nirqs = nr_irqs;
+#endif
+
+	for (irq = 0, data = irq_get_irq_data(irq); irq < nirqs;
 			irq++, data = irq_get_irq_data(irq)) {
 		if (!data)
 			continue;
diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile
index 715365da..7c7fec32 100644
--- a/scripts/conftest/Makefile
+++ b/scripts/conftest/Makefile
@@ -139,6 +139,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += i2c_driver_struct_remove_return_type_int
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += i2c_mux_add_adapter_has_no_class_argument
 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 += irq_get_nr_irqs
 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
diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh
index 10cdd005..6d9bb238 100755
--- a/scripts/conftest/conftest.sh
+++ b/scripts/conftest/conftest.sh
@@ -7459,6 +7459,22 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_IIO_DEV_OPAQUE_HAS_LOCK" "" "types"
         ;;
 
+        irq_get_nr_irqs)
+            #
+            # Determine if the function irq_get_nr_irqs() is present.
+            #
+            # Commit 5280a14a6079 ("genirq: Introduce irq_get_nr_irqs() and
+            # irq_set_nr_irqs()") added irq_get_nr_irqs() in Linux v6.13.
+            #
+            CODE="
+            #include <linux/irqnr.h>
+            void conftest_irq_get_nr_irqs(void) {
+                irq_get_nr_irqs();
+            }"
+
+            compile_check_conftest "$CODE" "NV_IRQ_GET_NR_IRQS_PRESENT" "" "functions"
+        ;;
+
         kthread_complete_and_exit)
             #
             # Determine if function kthread_complete_and_exit() is present.