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 <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/20200320115858.995685950@infradead.org

diff --git a/arch/x86/entry/thunk_32.S b/arch/x86/entry/thunk_32.S
index e010d4ae11f17b814ff787cc6059432f7ed383b6..3a07ce3ec70bafd65e437a837796ba0b5d4c53ed 100644 (file)
--- a/arch/x86/entry/thunk_32.S
+++ b/arch/x86/entry/thunk_32.S
@@ -35,9 +35,9 @@ SYM_CODE_END(\name)
 #endif
 
 #ifdef CONFIG_PREEMPTION
-       THUNK ___preempt_schedule, preempt_schedule
-       THUNK ___preempt_schedule_notrace, preempt_schedule_notrace
-       EXPORT_SYMBOL(___preempt_schedule)
-       EXPORT_SYMBOL(___preempt_schedule_notrace)
+       THUNK preempt_schedule_thunk, preempt_schedule
+       THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace
+       EXPORT_SYMBOL(preempt_schedule_thunk)
+       EXPORT_SYMBOL(preempt_schedule_notrace_thunk)
 #endif
 

diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S
index c5c3b6e86e62d6504d53a6016f15d42ef521f28b..dbe4493b534e9cf89fe6af8ec87bce0b8c3a3f11 100644 (file)
--- a/arch/x86/entry/thunk_64.S
+++ b/arch/x86/entry/thunk_64.S
@@ -47,10 +47,10 @@ SYM_FUNC_END(\name)
 #endif
 
 #ifdef CONFIG_PREEMPTION
-       THUNK ___preempt_schedule, preempt_schedule
-       THUNK ___preempt_schedule_notrace, preempt_schedule_notrace
-       EXPORT_SYMBOL(___preempt_schedule)
-       EXPORT_SYMBOL(___preempt_schedule_notrace)
+       THUNK preempt_schedule_thunk, preempt_schedule
+       THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace
+       EXPORT_SYMBOL(preempt_schedule_thunk)
+       EXPORT_SYMBOL(preempt_schedule_notrace_thunk)
 #endif
 
 #if defined(CONFIG_TRACE_IRQFLAGS) \

diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
index 3d4cb83a88284086448f45de9f7be0c0457f78cf..69485ca13665f1722a919bbf1c8345cd25e8d8ae 100644 (file)
--- a/arch/x86/include/asm/preempt.h
+++ b/arch/x86/include/asm/preempt.h
@@ -103,14 +103,14 @@ static __always_inline bool should_resched(int preempt_offset)
 }
 
 #ifdef CONFIG_PREEMPTION
-  extern asmlinkage void ___preempt_schedule(void);
+  extern asmlinkage void preempt_schedule_thunk(void);
 # define __preempt_schedule() \
-       asm volatile ("call ___preempt_schedule" : ASM_CALL_CONSTRAINT)
+       asm volatile ("call preempt_schedule_thunk" : ASM_CALL_CONSTRAINT)
 
   extern asmlinkage void preempt_schedule(void);
-  extern asmlinkage void ___preempt_schedule_notrace(void);
+  extern asmlinkage void preempt_schedule_notrace_thunk(void);
 # define __preempt_schedule_notrace() \
-       asm volatile ("call ___preempt_schedule_notrace" : ASM_CALL_CONSTRAINT)
+       asm volatile ("call preempt_schedule_notrace_thunk" : ASM_CALL_CONSTRAINT)
 
   extern asmlinkage void preempt_schedule_notrace(void);
 #endif