lkml.org 
[lkml]   [2020]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH v2 2/5] entry: rename exit_from_user_mode()
Date
Sven Schnelle <svens@linux.ibm.com> writes:

> In order to make this function publicly available rename
> it so it can still be inlined. An additional exit_from_user_mode()
> function will be added with a later commit.

That should of course be exit_to_user_mode() in the commit
description...

> Signed-off-by: Sven Schnelle <svens@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 683a8e1b5388..076ee1cde67f 100644
> --- a/kernel/entry/common.c
> +++ b/kernel/entry/common.c
> @@ -111,7 +111,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.
> @@ -122,7 +122,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();
> @@ -265,7 +265,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)
> @@ -278,7 +278,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)

\
 
 \ /
  Last update: 2020-12-01 15:44    [W:0.106 / U:8.768 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site