diff options
| author | Sid Manning <sidneym@codeaurora.org> | 2021-04-26 13:51:53 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-11 12:53:31 +0200 |
| commit | a245f6842d212080a1dd95a6b99d7d4b0c005740 (patch) | |
| tree | 38c3e29bad21e480d6b7be3532ba2e0073f66d16 /arch/hexagon | |
| parent | a7f51048c5a85501e41af8538c24af845f1679f6 (diff) | |
| download | linux-stable-a245f6842d212080a1dd95a6b99d7d4b0c005740.tar.gz linux-stable-a245f6842d212080a1dd95a6b99d7d4b0c005740.tar.bz2 linux-stable-a245f6842d212080a1dd95a6b99d7d4b0c005740.zip | |
Hexagon: change jumps to must-extend in futex_atomic_*
commit 6fff7410f6befe5744d54f0418d65a6322998c09 upstream.
Cross-section jumps from .fixup section must be extended.
Signed-off-by: Sid Manning <sidneym@codeaurora.org>
Signed-off-by: Brian Cain <bcain@codeaurora.org>
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/hexagon')
| -rw-r--r-- | arch/hexagon/include/asm/futex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/hexagon/include/asm/futex.h b/arch/hexagon/include/asm/futex.h index 6b9c554aee78..9fb00a0ae89f 100644 --- a/arch/hexagon/include/asm/futex.h +++ b/arch/hexagon/include/asm/futex.h @@ -21,7 +21,7 @@ "3:\n" \ ".section .fixup,\"ax\"\n" \ "4: %1 = #%5;\n" \ - " jump 3b\n" \ + " jump ##3b\n" \ ".previous\n" \ ".section __ex_table,\"a\"\n" \ ".long 1b,4b,2b,4b\n" \ @@ -90,7 +90,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval, "3:\n" ".section .fixup,\"ax\"\n" "4: %0 = #%6\n" - " jump 3b\n" + " jump ##3b\n" ".previous\n" ".section __ex_table,\"a\"\n" ".long 1b,4b,2b,4b\n" |