diff --git a/init/Kconfig b/init/Kconfig
index 12568107badf..d353036fe46a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2023,3 +2023,4 @@ config ARCH_HAS_SYSCALL_WRAPPER
 	def_bool n
 
 source "init/Kconfig.gki"
+source "init/Kconfig.gki-debug"
diff --git a/init/Kconfig.gki-debug b/init/Kconfig.gki-debug
new file mode 100644
index 000000000000..3e0ea7989eaf
--- /dev/null
+++ b/init/Kconfig.gki-debug
@@ -0,0 +1,9 @@
+config GKI_HIDDEN_RCUTORTURE
+	bool
+	select TASKS_RUDE_RCU
+
+config GKI_HACKS_FOR_DEBUG_CONFIG
+	bool "GKI Dummy config options for debug configurations"
+	select TRACE_PREEMPT_TOGGLE
+	select TRACE_IRQFLAGS
+	select GKI_HIDDEN_RCUTORTURE
diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
index 738842c4886b..f2bb429dd112 100644
--- a/kernel/rcu/update.c
+++ b/kernel/rcu/update.c
@@ -485,7 +485,8 @@ EXPORT_SYMBOL_GPL(do_trace_rcu_torture_read);
 	do { } while (0)
 #endif
 
-#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_MODULE(CONFIG_RCU_TORTURE_TEST)
+#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_MODULE(CONFIG_RCU_TORTURE_TEST) \
+	|| IS_ENABLED(CONFIG_GKI_HIDDEN_RCUTORTURE)
 /* Get rcutorture access to sched_setaffinity(). */
 long rcutorture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
 {