Merge tag 'mailbox-v4.21' of git://git.linaro.org/landing-teams/working/fujitsu/integ...

[linux-2.6-microblaze.git] / arch / xtensa / include / asm / futex.h

diff --git a/arch/xtensa/include/asm/futex.h b/arch/xtensa/include/asm/futex.h
index 5bfbc1c..fd0eef6 100644 (file)
--- a/arch/xtensa/include/asm/futex.h
+++ b/arch/xtensa/include/asm/futex.h
@@ -32,8 +32,8 @@
        "3:\n"                                          \
        "       .section .fixup,\"ax\"\n"               \
        "       .align 4\n"                             \
-       "4:     .long   3b\n"                           \
-       "5:     l32r    %0, 4b\n"                       \
+       "       .literal_position\n"                    \
+       "5:     movi    %0, 3b\n"                       \
        "       movi    %1, %3\n"                       \
        "       jx      %0\n"                           \
        "       .previous\n"                            \
@@ -108,8 +108,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
        "2:\n"
        "       .section .fixup,\"ax\"\n"
        "       .align 4\n"
-       "3:     .long   2b\n"
-       "4:     l32r    %1, 3b\n"
+       "       .literal_position\n"
+       "4:     movi    %1, 2b\n"
        "       movi    %0, %7\n"
        "       jx      %1\n"
        "       .previous\n"