The following commit has been merged into the core/entry branch of tip: Commit-ID: f052615ca0112378c3571fc9662bbbcd18cf6b8d Gitweb: https://git.kernel.org/tip/f052615ca0112378c3571fc9662bbbcd18cf6b8d Author: Sven Schnelle <sv...@linux.ibm.com> AuthorDate: Tue, 01 Dec 2020 15:27:52 +01:00 Committer: Thomas Gleixner <t...@linutronix.de> CommitterDate: Wed, 02 Dec 2020 10:32:18 +01:00
entry: Rename exit_to_user_mode() In order to make this function publicly available rename it so it can still be inlined. An additional exit_to_user_mode() function will be added with a later commit. Signed-off-by: Sven Schnelle <sv...@linux.ibm.com> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Link: https://lore.kernel.org/r/20201201142755.31931-3-sv...@linux.ibm.com --- kernel/entry/common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/entry/common.c b/kernel/entry/common.c index 8e294a7..dff07b4 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -122,7 +122,7 @@ noinstr void syscall_enter_from_user_mode_prepare(struct pt_regs *regs) } /** - * exit_to_user_mode - Fixup state when exiting to user mode + * __exit_to_user_mode - Fixup state when exiting to user mode * * Syscall/interupt exit enables interrupts, but the kernel state is * interrupts disabled when this is invoked. Also tell RCU about it. @@ -133,7 +133,7 @@ noinstr void syscall_enter_from_user_mode_prepare(struct pt_regs *regs) * mitigations, etc. * 4) Tell lockdep that interrupts are enabled */ -static __always_inline void exit_to_user_mode(void) +static __always_inline void __exit_to_user_mode(void) { instrumentation_begin(); trace_hardirqs_on_prepare(); @@ -299,7 +299,7 @@ __visible noinstr void syscall_exit_to_user_mode(struct pt_regs *regs) local_irq_disable_exit_to_user(); exit_to_user_mode_prepare(regs); instrumentation_end(); - exit_to_user_mode(); + __exit_to_user_mode(); } noinstr void irqentry_enter_from_user_mode(struct pt_regs *regs) @@ -312,7 +312,7 @@ noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs) instrumentation_begin(); exit_to_user_mode_prepare(regs); instrumentation_end(); - exit_to_user_mode(); + __exit_to_user_mode(); } noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs)
