diff --git a/kernel/sched/walt/walt.c b/kernel/sched/walt/walt.c
index dd925a739681..f27eaa2ccff4 100644
--- a/kernel/sched/walt/walt.c
+++ b/kernel/sched/walt/walt.c
@@ -4115,6 +4115,20 @@ static void android_rvh_build_perf_domains(void *unused, bool *eas_check)
 	*eas_check = true;
 }
 
+static void android_rvh_force_compatible_pre(void *unused, void *unused2)
+{
+	if (unlikely(walt_disabled))
+		return;
+	cpu_maps_update_begin();
+}
+
+static void android_rvh_force_compatible_post(void *unused, void *unused2)
+{
+	if (unlikely(walt_disabled))
+		return;
+	cpu_maps_update_done();
+}
+
 static void register_walt_hooks(void)
 {
 	register_trace_android_rvh_wake_up_new_task(android_rvh_wake_up_new_task, NULL);
@@ -4144,6 +4158,8 @@ static void register_walt_hooks(void)
 	register_trace_android_rvh_sched_exec(android_rvh_sched_exec, NULL);
 	register_trace_android_rvh_build_perf_domains(android_rvh_build_perf_domains, NULL);
 	register_trace_cpu_frequency_limits(walt_cpu_frequency_limits, NULL);
+	register_trace_android_rvh_force_compatible_pre(android_rvh_force_compatible_pre, NULL);
+	register_trace_android_rvh_force_compatible_post(android_rvh_force_compatible_post, NULL);
 }
 
 atomic64_t walt_irq_work_lastq_ws;