From fc005b3ced1be6d3a9ea3b57aa47796cf91fa102 Mon Sep 17 00:00:00 2001
From: Todd Kjos <tkjos@google.com>
Date: Thu, 14 Jan 2021 11:36:46 -0800
Subject: [PATCH] ANDROID: fix 0-day build-break for non-GKI

Code added for cpu pause feature should be conditional based on
CONFIG_SUSPEND

Fixes: 5ada76d05637 ("ANDROID: sched/pause: prevent wake up paused cpus")
Bug: 161210528
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I8dc31064bafb31dd570daae97b7bb547384a771f
---
 kernel/smp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/smp.c b/kernel/smp.c
index d8431d301bb2..d0e3a6d4af57 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -954,7 +954,9 @@ void wake_up_all_idle_cpus(void)
 		if (cpu == smp_processor_id())
 			continue;
 
+#if CONFIG_SUSPEND
 		if (s2idle_state == S2IDLE_STATE_ENTER || cpu_active(cpu))
+#endif
 			wake_up_if_idle(cpu);
 	}
 	preempt_enable();