From cadae13c7a47a6889e95ca6debc04b20a054e722 Mon Sep 17 00:00:00 2001 From: Pavankumar Kondeti Date: Mon, 1 Feb 2021 15:39:11 +0530 Subject: [PATCH] sched/walt: Fix lockdep warning static_key_disable_cpuslocked() API is called to disable TTWU_QUEUE feature. This API expects read side of cpu_hotplug_lock lock is taken. Since we are not acquiring that lock, use static_key_disable() API which internally takes care of the locking. Change-Id: Ic8c7023235dd2e03bfe93d3f87a6a68e4f5b9b0d Signed-off-by: Pavankumar Kondeti --- kernel/sched/walt/walt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/sched/walt/walt.c b/kernel/sched/walt/walt.c index 15361ba46a96..baa9b8427c0a 100644 --- a/kernel/sched/walt/walt.c +++ b/kernel/sched/walt/walt.c @@ -4174,8 +4174,10 @@ static void walt_init(void) waltgov_register(); i = match_string(sched_feat_names, __SCHED_FEAT_NR, "TTWU_QUEUE"); - static_key_disable_cpuslocked(&sched_feat_keys[i]); - sysctl_sched_features &= ~(1UL << i); + if (i >= 0) { + static_key_disable(&sched_feat_keys[i]); + sysctl_sched_features &= ~(1UL << i); + } } static bool are_cpufreq_policies_available(void)