lkml.org 
[lkml]   [2018]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] arch/arm64/include/asm/jump_label.h: use asm_volatile_goto
On Sun, Sep 09, 2018 at 05:47:31PM +0200, Miguel Ojeda wrote:
> All other uses of "asm goto" go through asm_volatile_goto
> (including the arm version of the same file). For consistency,
> use it here as well.
>
> Cc: Nick Desaulniers <ndesaulniers@google.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
> ---
> arch/arm64/include/asm/jump_label.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Thanks, I'll pick this up as a fix.

Will

> diff --git a/arch/arm64/include/asm/jump_label.h b/arch/arm64/include/asm/jump_label.h
> index 1b5e0e843c3a..7e2b3e360086 100644
> --- a/arch/arm64/include/asm/jump_label.h
> +++ b/arch/arm64/include/asm/jump_label.h
> @@ -28,7 +28,7 @@
>
> static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
> {
> - asm goto("1: nop\n\t"
> + asm_volatile_goto("1: nop\n\t"
> ".pushsection __jump_table, \"aw\"\n\t"
> ".align 3\n\t"
> ".quad 1b, %l[l_yes], %c0\n\t"
> @@ -42,7 +42,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
>
> static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
> {
> - asm goto("1: b %l[l_yes]\n\t"
> + asm_volatile_goto("1: b %l[l_yes]\n\t"
> ".pushsection __jump_table, \"aw\"\n\t"
> ".align 3\n\t"
> ".quad 1b, %l[l_yes], %c0\n\t"
> --
> 2.17.1
>

\
 
 \ /
  Last update: 2018-09-10 11:51    [W:0.037 / U:0.792 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site