Merge tag 'chrome-platform-for-linus-4.13' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / arch / arm64 / crypto / sha1-ce-core.S

diff --git a/arch/arm64/crypto/sha1-ce-core.S b/arch/arm64/crypto/sha1-ce-core.S
index c98e7e849f06f460d99cbddbe31aee73c8d1c686..8550408735a03e6657a994e3b0961d632b444818 100644 (file)
--- a/arch/arm64/crypto/sha1-ce-core.S
+++ b/arch/arm64/crypto/sha1-ce-core.S
@@ -82,7 +82,8 @@ ENTRY(sha1_ce_transform)
        ldr             dgb, [x0, #16]
 
        /* load sha1_ce_state::finalize */
-       ldr             w4, [x0, #:lo12:sha1_ce_offsetof_finalize]
+       ldr_l           w4, sha1_ce_offsetof_finalize, x4
+       ldr             w4, [x0, x4]
 
        /* load input */
 0:     ld1             {v8.4s-v11.4s}, [x1], #64
@@ -132,7 +133,8 @@ CPU_LE(     rev32           v11.16b, v11.16b        )
         * the padding is handled by the C code in that case.
         */
        cbz             x4, 3f
-       ldr             x4, [x0, #:lo12:sha1_ce_offsetof_count]
+       ldr_l           w4, sha1_ce_offsetof_count, x4
+       ldr             x4, [x0, x4]
        movi            v9.2d, #0
        mov             x8, #0x80000000
        movi            v10.2d, #0