[RFC,23/86] Revert "sched,x86: Allow !PREEMPT_DYNAMIC"

Commit Message

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

This reverts commit c5e6fc08feb2b88dc5dac2f3c817e1c2a4cafda4.

Signed-off-by: Ankur Arora <[e-mail]>
---
 arch/x86/include/asm/preempt.h | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

Patch

diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
index 495faed1c76c..49d2f0396be4 100644
--- a/arch/x86/include/asm/preempt.h
+++ b/arch/x86/include/asm/preempt.h
@@ -111,13 +111,6 @@  extern asmlinkage void preempt_schedule_thunk(void);
 
 #define __preempt_schedule_func preempt_schedule_thunk
 
-extern asmlinkage void preempt_schedule_notrace(void);
-extern asmlinkage void preempt_schedule_notrace_thunk(void);
-
-#define __preempt_schedule_notrace_func preempt_schedule_notrace_thunk
-
-#ifdef CONFIG_PREEMPT_DYNAMIC
-
 DECLARE_STATIC_CALL(preempt_schedule, __preempt_schedule_func);
 
 #define __preempt_schedule() \
@@ -126,6 +119,11 @@  do { \
 	asm volatile ("call " STATIC_CALL_TRAMP_STR(preempt_schedule) : ASM_CALL_CONSTRAINT); \
 } while (0)
 
+extern asmlinkage void preempt_schedule_notrace(void);
+extern asmlinkage void preempt_schedule_notrace_thunk(void);
+
+#define __preempt_schedule_notrace_func preempt_schedule_notrace_thunk
+
 DECLARE_STATIC_CALL(preempt_schedule_notrace, __preempt_schedule_notrace_func);
 
 #define __preempt_schedule_notrace() \
@@ -134,16 +132,6 @@  do { \
 	asm volatile ("call " STATIC_CALL_TRAMP_STR(preempt_schedule_notrace) : ASM_CALL_CONSTRAINT); \
 } while (0)
 
-#else /* PREEMPT_DYNAMIC */
-
-#define __preempt_schedule() \
-	asm volatile ("call preempt_schedule_thunk" : ASM_CALL_CONSTRAINT);
-
-#define __preempt_schedule_notrace() \
-	asm volatile ("call preempt_schedule_notrace_thunk" : ASM_CALL_CONSTRAINT);
-
-#endif /* PREEMPT_DYNAMIC */
-
-#endif /* PREEMPTION */
+#endif
 
 #endif /* __ASM_PREEMPT_H */