[RFC,27/86] Revert "preempt/dynamic: Provide irqentry_exit_cond_resched() static call"

Commit Message

Ankur Arora Nov. 7, 2023, 9:57 p.m. UTC

This reverts commit 40607ee97e4eec5655cc0f76a720bdc4c63a6434.

Signed-off-by: Ankur Arora <[e-mail]>
---
 include/linux/entry-common.h |  4 ----
 kernel/entry/common.c        | 10 +---------
 2 files changed, 1 insertion(+), 13 deletions(-)

Patch

diff --git a/include/linux/entry-common.h b/include/linux/entry-common.h
index 49e9fe9489b6..fb2e349a17d2 100644
--- a/include/linux/entry-common.h
+++ b/include/linux/entry-common.h
@@ -2,7 +2,6 @@ 
 #ifndef __LINUX_ENTRYCOMMON_H
 #define __LINUX_ENTRYCOMMON_H
 
-#include <linux/static_call_types.h>
 #include <linux/ptrace.h>
 #include <linux/syscalls.h>
 #include <linux/seccomp.h>
@@ -415,9 +414,6 @@  irqentry_state_t noinstr irqentry_enter(struct pt_regs *regs);
  * Conditional reschedule with additional sanity checks.
  */
 void irqentry_exit_cond_resched(void);
-#ifdef CONFIG_PREEMPT_DYNAMIC
-DECLARE_STATIC_CALL(irqentry_exit_cond_resched, irqentry_exit_cond_resched);
-#endif
 
 /**
  * irqentry_exit - Handle return from exception that used irqentry_enter()
diff --git a/kernel/entry/common.c b/kernel/entry/common.c
index d866c49dc015..194c349b8be7 100644
--- a/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@ -388,9 +388,6 @@  void irqentry_exit_cond_resched(void)
 			preempt_schedule_irq();
 	}
 }
-#ifdef CONFIG_PREEMPT_DYNAMIC
-DEFINE_STATIC_CALL(irqentry_exit_cond_resched, irqentry_exit_cond_resched);
-#endif
 
 noinstr void irqentry_exit(struct pt_regs *regs, irqentry_state_t state)
 {
@@ -417,13 +414,8 @@  noinstr void irqentry_exit(struct pt_regs *regs, irqentry_state_t state)
 		}
 
 		instrumentation_begin();
-		if (IS_ENABLED(CONFIG_PREEMPTION)) {
-#ifdef CONFIG_PREEMT_DYNAMIC
-			static_call(irqentry_exit_cond_resched)();
-#else
+		if (IS_ENABLED(CONFIG_PREEMPTION))
 			irqentry_exit_cond_resched();
-#endif
-		}
 		/* Covers both tracing and lockdep */
 		trace_hardirqs_on();
 		instrumentation_end();