diff --git a/kernel/sched/walt/walt.c b/kernel/sched/walt/walt.c
index 23f9a01f9a26..5f4bd7949cc5 100644
--- a/kernel/sched/walt/walt.c
+++ b/kernel/sched/walt/walt.c
@@ -4440,6 +4440,14 @@ static void android_rvh_build_perf_domains(void *unused, bool *eas_check)
 	*eas_check = true;
 }
 
+static DECLARE_COMPLETION(rebuild_domains_completion);
+static void rebuild_sd_workfn(struct work_struct *work)
+{
+	rebuild_sched_domains();
+	complete(&rebuild_domains_completion);
+}
+static DECLARE_WORK(rebuild_sd_work, rebuild_sd_workfn);
+
 static void walt_do_sched_yield(void *unused, struct rq *rq)
 {
 	struct task_struct *curr = rq->curr;
@@ -4573,6 +4581,8 @@ static void walt_init(struct work_struct *work)
 	walt_cfs_init();
 	walt_halt_init();
 	wait_for_completion_interruptible(&tick_sched_clock_completion);
+	schedule_work(&rebuild_sd_work);
+	wait_for_completion_interruptible(&rebuild_domains_completion);
 	stop_machine(walt_init_stop_handler, NULL, NULL);
 
 	hdr = register_sysctl_table(walt_base_table);
diff --git a/kernel/sched/walt/walt.h b/kernel/sched/walt/walt.h
index c72e68120ee5..6274f7a49071 100644
--- a/kernel/sched/walt/walt.h
+++ b/kernel/sched/walt/walt.h
@@ -189,6 +189,7 @@ extern void walt_init_foreground_tg(struct task_group *tg);
 extern int register_walt_callback(void);
 extern int input_boost_init(void);
 extern int core_ctl_init(void);
+extern void rebuild_sched_domains(void);
 
 extern atomic64_t walt_irq_work_lastq_ws;
 extern unsigned int __read_mostly sched_ravg_window;