| Message ID | 1667027268-1255-1-git-send-email-quic_mojha@quicinc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: entry: Fix typo | expand |
On Sat, Oct 29, 2022 at 12:37:48PM +0530, Mukesh Ojha wrote: > diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c > index 9173fad..b694d8f 100644 > --- a/arch/arm64/kernel/entry-common.c > +++ b/arch/arm64/kernel/entry-common.c > @@ -30,7 +30,7 @@ > /* > * Handle IRQ/context state management when entering from kernel mode. > * Before this function is called it is not safe to call regular kernel code, > - * intrumentable code, or any code which may trigger an exception. > + * instrumentable code, or any code which may trigger an exception. > * > * This is intended to match the logic in irqentry_enter(), handling the kernel > * mode transitions only. > @@ -63,7 +63,7 @@ static void noinstr enter_from_kernel_mode(struct pt_regs *regs) > /* > * Handle IRQ/context state management when exiting to kernel mode. > * After this function returns it is not safe to call regular kernel code, > - * intrumentable code, or any code which may trigger an exception. > + * instrumentable code, or any code which may trigger an exception. > * > * This is intended to match the logic in irqentry_exit(), handling the kernel > * mode transitions only, and with preemption handled elsewhere. > @@ -97,7 +97,7 @@ static void noinstr exit_to_kernel_mode(struct pt_regs *regs) > /* > * Handle IRQ/context state management when entering from user mode. > * Before this function is called it is not safe to call regular kernel code, > - * intrumentable code, or any code which may trigger an exception. > + * instrumentable code, or any code which may trigger an exception. > */ > static __always_inline void __enter_from_user_mode(void) > { > @@ -116,7 +116,7 @@ static __always_inline void enter_from_user_mode(struct pt_regs *regs) > /* > * Handle IRQ/context state management when exiting to user mode. > * After this function returns it is not safe to call regular kernel code, > - * intrumentable code, or any code which may trigger an exception. > + * instrumentable code, or any code which may trigger an exception. > */ > static __always_inline void __exit_to_user_mode(void) > { > @@ -152,7 +152,7 @@ asmlinkage void noinstr asm_exit_to_user_mode(struct pt_regs *regs) > /* > * Handle IRQ/context state management when entering an NMI from user/kernel > * mode. Before this function is called it is not safe to call regular kernel > - * code, intrumentable code, or any code which may trigger an exception. > + * code, instrumentable code, or any code which may trigger an exception. > */ > static void noinstr arm64_enter_nmi(struct pt_regs *regs) > { > @@ -170,7 +170,7 @@ static void noinstr arm64_enter_nmi(struct pt_regs *regs) > /* > * Handle IRQ/context state management when exiting an NMI from user/kernel > * mode. After this function returns it is not safe to call regular kernel > - * code, intrumentable code, or any code which may trigger an exception. > + * code, instrumentable code, or any code which may trigger an exception. > */ > static void noinstr arm64_exit_nmi(struct pt_regs *regs) > { > @@ -192,7 +192,7 @@ static void noinstr arm64_exit_nmi(struct pt_regs *regs) > /* > * Handle IRQ/context state management when entering a debug exception from > * kernel mode. Before this function is called it is not safe to call regular > - * kernel code, intrumentable code, or any code which may trigger an exception. > + * kernel code, instrumentable code, or any code which may trigger an exception. > */ > static void noinstr arm64_enter_el1_dbg(struct pt_regs *regs) > { > @@ -207,7 +207,7 @@ static void noinstr arm64_enter_el1_dbg(struct pt_regs *regs) > /* > * Handle IRQ/context state management when exiting a debug exception from > * kernel mode. After this function returns it is not safe to call regular > - * kernel code, intrumentable code, or any code which may trigger an exception. > + * kernel code, instrumentable code, or any code which may trigger an exception. > */ > static void noinstr arm64_exit_el1_dbg(struct pt_regs *regs) > { What about "... it is unsafe to call regular kernel, instrumentable, or any other code ..." instead? Thanks.
On Sat, Oct 29, 2022 at 12:37:48PM +0530, Mukesh Ojha wrote: > Fix the following typo in entry-common.c > intrumentable => instrumentable > > Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Thanks, Mark. > --- > arch/arm64/kernel/entry-common.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c > index 9173fad..b694d8f 100644 > --- a/arch/arm64/kernel/entry-common.c > +++ b/arch/arm64/kernel/entry-common.c > @@ -30,7 +30,7 @@ > /* > * Handle IRQ/context state management when entering from kernel mode. > * Before this function is called it is not safe to call regular kernel code, > - * intrumentable code, or any code which may trigger an exception. > + * instrumentable code, or any code which may trigger an exception. > * > * This is intended to match the logic in irqentry_enter(), handling the kernel > * mode transitions only. > @@ -63,7 +63,7 @@ static void noinstr enter_from_kernel_mode(struct pt_regs *regs) > /* > * Handle IRQ/context state management when exiting to kernel mode. > * After this function returns it is not safe to call regular kernel code, > - * intrumentable code, or any code which may trigger an exception. > + * instrumentable code, or any code which may trigger an exception. > * > * This is intended to match the logic in irqentry_exit(), handling the kernel > * mode transitions only, and with preemption handled elsewhere. > @@ -97,7 +97,7 @@ static void noinstr exit_to_kernel_mode(struct pt_regs *regs) > /* > * Handle IRQ/context state management when entering from user mode. > * Before this function is called it is not safe to call regular kernel code, > - * intrumentable code, or any code which may trigger an exception. > + * instrumentable code, or any code which may trigger an exception. > */ > static __always_inline void __enter_from_user_mode(void) > { > @@ -116,7 +116,7 @@ static __always_inline void enter_from_user_mode(struct pt_regs *regs) > /* > * Handle IRQ/context state management when exiting to user mode. > * After this function returns it is not safe to call regular kernel code, > - * intrumentable code, or any code which may trigger an exception. > + * instrumentable code, or any code which may trigger an exception. > */ > static __always_inline void __exit_to_user_mode(void) > { > @@ -152,7 +152,7 @@ asmlinkage void noinstr asm_exit_to_user_mode(struct pt_regs *regs) > /* > * Handle IRQ/context state management when entering an NMI from user/kernel > * mode. Before this function is called it is not safe to call regular kernel > - * code, intrumentable code, or any code which may trigger an exception. > + * code, instrumentable code, or any code which may trigger an exception. > */ > static void noinstr arm64_enter_nmi(struct pt_regs *regs) > { > @@ -170,7 +170,7 @@ static void noinstr arm64_enter_nmi(struct pt_regs *regs) > /* > * Handle IRQ/context state management when exiting an NMI from user/kernel > * mode. After this function returns it is not safe to call regular kernel > - * code, intrumentable code, or any code which may trigger an exception. > + * code, instrumentable code, or any code which may trigger an exception. > */ > static void noinstr arm64_exit_nmi(struct pt_regs *regs) > { > @@ -192,7 +192,7 @@ static void noinstr arm64_exit_nmi(struct pt_regs *regs) > /* > * Handle IRQ/context state management when entering a debug exception from > * kernel mode. Before this function is called it is not safe to call regular > - * kernel code, intrumentable code, or any code which may trigger an exception. > + * kernel code, instrumentable code, or any code which may trigger an exception. > */ > static void noinstr arm64_enter_el1_dbg(struct pt_regs *regs) > { > @@ -207,7 +207,7 @@ static void noinstr arm64_enter_el1_dbg(struct pt_regs *regs) > /* > * Handle IRQ/context state management when exiting a debug exception from > * kernel mode. After this function returns it is not safe to call regular > - * kernel code, intrumentable code, or any code which may trigger an exception. > + * kernel code, instrumentable code, or any code which may trigger an exception. > */ > static void noinstr arm64_exit_el1_dbg(struct pt_regs *regs) > { > -- > 2.7.4 >
On Sat, Oct 29, 2022 at 08:35:49PM +0700, Bagas Sanjaya wrote: > On Sat, Oct 29, 2022 at 12:37:48PM +0530, Mukesh Ojha wrote: > > /* > > * Handle IRQ/context state management when exiting a debug exception from > > * kernel mode. After this function returns it is not safe to call regular > > - * kernel code, intrumentable code, or any code which may trigger an exception. > > + * kernel code, instrumentable code, or any code which may trigger an exception. > > */ > > static void noinstr arm64_exit_el1_dbg(struct pt_regs *regs) > > { > > What about "... it is unsafe to call regular kernel, instrumentable, or > any other code ..." instead? I much prefer this as-is, but with the typo fixed. Thanks, Mark.
On Sat, 29 Oct 2022 12:37:48 +0530, Mukesh Ojha wrote: > Fix the following typo in entry-common.c > intrumentable => instrumentable > > Applied to arm64 (for-next/trivial), thanks! [1/1] arm64: entry: Fix typo https://git.kernel.org/arm64/c/59598b42eb52 Cheers,
diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c index 9173fad..b694d8f 100644 --- a/arch/arm64/kernel/entry-common.c +++ b/arch/arm64/kernel/entry-common.c @@ -30,7 +30,7 @@ /* * Handle IRQ/context state management when entering from kernel mode. * Before this function is called it is not safe to call regular kernel code, - * intrumentable code, or any code which may trigger an exception. + * instrumentable code, or any code which may trigger an exception. * * This is intended to match the logic in irqentry_enter(), handling the kernel * mode transitions only. @@ -63,7 +63,7 @@ static void noinstr enter_from_kernel_mode(struct pt_regs *regs) /* * Handle IRQ/context state management when exiting to kernel mode. * After this function returns it is not safe to call regular kernel code, - * intrumentable code, or any code which may trigger an exception. + * instrumentable code, or any code which may trigger an exception. * * This is intended to match the logic in irqentry_exit(), handling the kernel * mode transitions only, and with preemption handled elsewhere. @@ -97,7 +97,7 @@ static void noinstr exit_to_kernel_mode(struct pt_regs *regs) /* * Handle IRQ/context state management when entering from user mode. * Before this function is called it is not safe to call regular kernel code, - * intrumentable code, or any code which may trigger an exception. + * instrumentable code, or any code which may trigger an exception. */ static __always_inline void __enter_from_user_mode(void) { @@ -116,7 +116,7 @@ static __always_inline void enter_from_user_mode(struct pt_regs *regs) /* * Handle IRQ/context state management when exiting to user mode. * After this function returns it is not safe to call regular kernel code, - * intrumentable code, or any code which may trigger an exception. + * instrumentable code, or any code which may trigger an exception. */ static __always_inline void __exit_to_user_mode(void) { @@ -152,7 +152,7 @@ asmlinkage void noinstr asm_exit_to_user_mode(struct pt_regs *regs) /* * Handle IRQ/context state management when entering an NMI from user/kernel * mode. Before this function is called it is not safe to call regular kernel - * code, intrumentable code, or any code which may trigger an exception. + * code, instrumentable code, or any code which may trigger an exception. */ static void noinstr arm64_enter_nmi(struct pt_regs *regs) { @@ -170,7 +170,7 @@ static void noinstr arm64_enter_nmi(struct pt_regs *regs) /* * Handle IRQ/context state management when exiting an NMI from user/kernel * mode. After this function returns it is not safe to call regular kernel - * code, intrumentable code, or any code which may trigger an exception. + * code, instrumentable code, or any code which may trigger an exception. */ static void noinstr arm64_exit_nmi(struct pt_regs *regs) { @@ -192,7 +192,7 @@ static void noinstr arm64_exit_nmi(struct pt_regs *regs) /* * Handle IRQ/context state management when entering a debug exception from * kernel mode. Before this function is called it is not safe to call regular - * kernel code, intrumentable code, or any code which may trigger an exception. + * kernel code, instrumentable code, or any code which may trigger an exception. */ static void noinstr arm64_enter_el1_dbg(struct pt_regs *regs) { @@ -207,7 +207,7 @@ static void noinstr arm64_enter_el1_dbg(struct pt_regs *regs) /* * Handle IRQ/context state management when exiting a debug exception from * kernel mode. After this function returns it is not safe to call regular - * kernel code, intrumentable code, or any code which may trigger an exception. + * kernel code, instrumentable code, or any code which may trigger an exception. */ static void noinstr arm64_exit_el1_dbg(struct pt_regs *regs) {
Fix the following typo in entry-common.c intrumentable => instrumentable Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com> --- arch/arm64/kernel/entry-common.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)