diff options
| author | Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> | 2018-09-09 17:47:31 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-09-11 11:07:11 +0100 |
| commit | 13aceef06adfaf93d52e01e28a8bc8a0ad471d83 (patch) | |
| tree | badc732f6846d982587c45c73e8d8ca7b9d35888 /arch/arm64/include/asm | |
| parent | 11da3a7f84f19c26da6f86af878298694ede0804 (diff) | |
| download | linux-13aceef06adfaf93d52e01e28a8bc8a0ad471d83.tar.gz linux-13aceef06adfaf93d52e01e28a8bc8a0ad471d83.tar.bz2 linux-13aceef06adfaf93d52e01e28a8bc8a0ad471d83.zip | |
arm64: jump_label.h: use asm_volatile_goto macro instead of "asm goto"
All other uses of "asm goto" go through asm_volatile_goto, which avoids
a miscompile when using GCC < 4.8.2. Replace our open-coded "asm goto"
statements with the asm_volatile_goto macro to avoid issues with older
toolchains.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/include/asm')
| -rw-r--r-- | arch/arm64/include/asm/jump_label.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ l_yes: 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" |