| From 6fff7410f6befe5744d54f0418d65a6322998c09 Mon Sep 17 00:00:00 2001 |
| From: Sid Manning <sidneym@codeaurora.org> |
| Date: Mon, 26 Apr 2021 13:51:53 -0500 |
| Subject: Hexagon: change jumps to must-extend in futex_atomic_* |
| |
| From: Sid Manning <sidneym@codeaurora.org> |
| |
| 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> |
| |
| --- |
| arch/hexagon/include/asm/futex.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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, |
| "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" |
