Commit c5e6fc08 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched,x86: Allow !PREEMPT_DYNAMIC 



Allow building x86 with PREEMPT_DYNAMIC=n, this is needed for
PREEMPT_RT as it makes no sense to not have full preemption on
PREEMPT_RT.

Fixes: 8c98e8cf723c ("preempt/dynamic: Provide preempt_schedule[_notrace]() static calls")
Reported-by: default avatarMike Galbraith <efault@gmx.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarMike Galbraith <efault@gmx.de>
Link: https://lkml.kernel.org/r/YCK1+JyFNxQnWeXK@hirez.programming.kicks-ass.net
parent 4ae7dc97

arch/x86/include/asm/preempt.h

+18 −6
Original line number Diff line number Diff line
@@ -110,6 +110,13 @@ 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() \
@@ -118,11 +125,6 @@ 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() \
@@ -131,6 +133,16 @@ do { \ 
	asm volatile ("call " STATIC_CALL_TRAMP_STR(preempt_schedule_notrace) : ASM_CALL_CONSTRAINT); \

} while (0)



#endif

#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 /* __ASM_PREEMPT_H */