This reverts commit 33c64734be3461222a8aa27d3dadc477ebca62de. Signed-off-by: Ankur Arora <ankur.a.arora@xxxxxxxxxx> --- arch/Kconfig | 1 + kernel/sched/core.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 3eb64363b48d..afe6785fd3e2 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -1396,6 +1396,7 @@ config HAVE_STATIC_CALL_INLINE config HAVE_PREEMPT_DYNAMIC bool depends on HAVE_STATIC_CALL + depends on GENERIC_ENTRY help Select this if the architecture support boot time preempt setting on top of static calls. It is strongly advised to support inline diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 51c992105bc0..686e89d4ebb7 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8636,9 +8636,7 @@ EXPORT_SYMBOL(__cond_resched_rwlock_write); #ifdef CONFIG_PREEMPT_DYNAMIC -#ifdef CONFIG_GENERIC_ENTRY #include <linux/entry-common.h> -#endif /* * SC:cond_resched -- 2.31.1