Skip to content

Commit 46db36a

Browse files
Peter ZijlstraKAGA-KOKO
authored andcommitted
x86/entry: Rename ___preempt_schedule
Because moar '_' isn't always moar readable. git grep -l "___preempt_schedule\(_notrace\)*" | while read file; do sed -ie 's/___preempt_schedule\(_notrace\)*/preempt_schedule\1_thunk/g' $file; done Reported-by: Thomas Gleixner <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Thomas Gleixner <[email protected]> Acked-by: Will Deacon <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent ffd75b3 commit 46db36a

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

arch/x86/entry/thunk_32.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ SYM_CODE_END(\name)
3535
#endif
3636

3737
#ifdef CONFIG_PREEMPTION
38-
THUNK ___preempt_schedule, preempt_schedule
39-
THUNK ___preempt_schedule_notrace, preempt_schedule_notrace
40-
EXPORT_SYMBOL(___preempt_schedule)
41-
EXPORT_SYMBOL(___preempt_schedule_notrace)
38+
THUNK preempt_schedule_thunk, preempt_schedule
39+
THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace
40+
EXPORT_SYMBOL(preempt_schedule_thunk)
41+
EXPORT_SYMBOL(preempt_schedule_notrace_thunk)
4242
#endif
4343

arch/x86/entry/thunk_64.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ SYM_FUNC_END(\name)
4747
#endif
4848

4949
#ifdef CONFIG_PREEMPTION
50-
THUNK ___preempt_schedule, preempt_schedule
51-
THUNK ___preempt_schedule_notrace, preempt_schedule_notrace
52-
EXPORT_SYMBOL(___preempt_schedule)
53-
EXPORT_SYMBOL(___preempt_schedule_notrace)
50+
THUNK preempt_schedule_thunk, preempt_schedule
51+
THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace
52+
EXPORT_SYMBOL(preempt_schedule_thunk)
53+
EXPORT_SYMBOL(preempt_schedule_notrace_thunk)
5454
#endif
5555

5656
#if defined(CONFIG_TRACE_IRQFLAGS) \

arch/x86/include/asm/preempt.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ static __always_inline bool should_resched(int preempt_offset)
103103
}
104104

105105
#ifdef CONFIG_PREEMPTION
106-
extern asmlinkage void ___preempt_schedule(void);
106+
extern asmlinkage void preempt_schedule_thunk(void);
107107
# define __preempt_schedule() \
108-
asm volatile ("call ___preempt_schedule" : ASM_CALL_CONSTRAINT)
108+
asm volatile ("call preempt_schedule_thunk" : ASM_CALL_CONSTRAINT)
109109

110110
extern asmlinkage void preempt_schedule(void);
111-
extern asmlinkage void ___preempt_schedule_notrace(void);
111+
extern asmlinkage void preempt_schedule_notrace_thunk(void);
112112
# define __preempt_schedule_notrace() \
113-
asm volatile ("call ___preempt_schedule_notrace" : ASM_CALL_CONSTRAINT)
113+
asm volatile ("call preempt_schedule_notrace_thunk" : ASM_CALL_CONSTRAINT)
114114

115115
extern asmlinkage void preempt_schedule_notrace(void);
116116
#endif

0 commit comments

Comments
 (0)