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

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

diff --git a/arch/arm64/crypto/sha2-ce-core.S b/arch/arm64/crypto/sha2-ce-core.S
index 01cfee066837cd9a65f6d54d8a27d4916e5a1675..679c6c002f4fbebffd7a0256602ce30e39ff86cb 100644 (file)
--- a/arch/arm64/crypto/sha2-ce-core.S
+++ b/arch/arm64/crypto/sha2-ce-core.S
@@ -88,7 +88,8 @@ ENTRY(sha2_ce_transform)
        ld1             {dgav.4s, dgbv.4s}, [x0]
 
        /* load sha256_ce_state::finalize */
-       ldr             w4, [x0, #:lo12:sha256_ce_offsetof_finalize]
+       ldr_l           w4, sha256_ce_offsetof_finalize, x4
+       ldr             w4, [x0, x4]
 
        /* load input */
 0:     ld1             {v16.4s-v19.4s}, [x1], #64
@@ -136,7 +137,8 @@ CPU_LE(     rev32           v19.16b, v19.16b        )
         * the padding is handled by the C code in that case.
         */
        cbz             x4, 3f
-       ldr             x4, [x0, #:lo12:sha256_ce_offsetof_count]
+       ldr_l           w4, sha256_ce_offsetof_count, x4
+       ldr             x4, [x0, x4]
        movi            v17.2d, #0
        mov             x8, #0x80000000
        movi            v18.2d, #0