[PATCH -next v4 10/19] arm64: entry: preempt_schedule_irq() only if PREEMPTION enabled

[Jinjie Ruan <ruanjinjie@xxxxxxxxxx>]

Whether PREEMPT_DYNAMIC enabled or not, PREEMPTION should
be enabled to allow reschedule after an interrupt.

Signed-off-by: Jinjie Ruan <ruanjinjie@xxxxxxxxxx>
---
 arch/arm64/kernel/entry-common.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c
index 3ea3ab32d232..58d660878c09 100644
--- a/arch/arm64/kernel/entry-common.c
+++ b/arch/arm64/kernel/entry-common.c
@@ -65,8 +65,6 @@ static noinstr irqentry_state_t enter_from_kernel_mode(struct 
pt_regs *regs)
 DEFINE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched);
 #define need_irq_preemption() \
        (static_branch_unlikely(&sk_dynamic_irqentry_exit_cond_resched))
-#else
-#define need_irq_preemption()  (IS_ENABLED(CONFIG_PREEMPTION))
 #endif
 
 static inline bool arm64_irqentry_exit_need_resched(void)
@@ -121,9 +119,12 @@ static void noinstr exit_to_kernel_mode(struct pt_regs 
*regs,
                        return;
                }
 
-               if (!preempt_count()) {
-                       if (need_resched() && 
arm64_irqentry_exit_need_resched())
-                               preempt_schedule_irq();
+               if (IS_ENABLED(CONFIG_PREEMPTION)) {
+                       if (!preempt_count()) {
+                               if (need_resched() &&
+                                   arm64_irqentry_exit_need_resched())
+                                       preempt_schedule_irq();
+                       }
                }
 
                trace_hardirqs_on();
-- 
2.34.1