tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

arm64: crypto: Modernize some extra assembly annotations

A couple of functions were missed in the modernisation of assembly macros,
update them too.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

authored by

Mark Brown and committed by
Catalin Marinas 2ca86c34 f8788d86

+8 -8
+8 -8
arch/arm64/crypto/ghash-ce-core.S
··· 587 587 * struct ghash_key const *k, u64 dg[], u8 ctr[], 588 588 * int rounds, u8 tag) 589 589 */ 590 - ENTRY(pmull_gcm_encrypt) 590 + SYM_FUNC_START(pmull_gcm_encrypt) 591 591 pmull_gcm_do_crypt 1 592 - ENDPROC(pmull_gcm_encrypt) 592 + SYM_FUNC_END(pmull_gcm_encrypt) 593 593 594 594 /* 595 595 * void pmull_gcm_decrypt(int blocks, u8 dst[], const u8 src[], 596 596 * struct ghash_key const *k, u64 dg[], u8 ctr[], 597 597 * int rounds, u8 tag) 598 598 */ 599 - ENTRY(pmull_gcm_decrypt) 599 + SYM_FUNC_START(pmull_gcm_decrypt) 600 600 pmull_gcm_do_crypt 0 601 - ENDPROC(pmull_gcm_decrypt) 601 + SYM_FUNC_END(pmull_gcm_decrypt) 602 602 603 - pmull_gcm_ghash_4x: 603 + SYM_FUNC_START_LOCAL(pmull_gcm_ghash_4x) 604 604 movi MASK.16b, #0xe1 605 605 shl MASK.2d, MASK.2d, #57 606 606 ··· 681 681 eor XL.16b, XL.16b, T2.16b 682 682 683 683 ret 684 - ENDPROC(pmull_gcm_ghash_4x) 684 + SYM_FUNC_END(pmull_gcm_ghash_4x) 685 685 686 - pmull_gcm_enc_4x: 686 + SYM_FUNC_START_LOCAL(pmull_gcm_enc_4x) 687 687 ld1 {KS0.16b}, [x5] // load upper counter 688 688 sub w10, w8, #4 689 689 sub w11, w8, #3 ··· 746 746 eor INP3.16b, INP3.16b, KS3.16b 747 747 748 748 ret 749 - ENDPROC(pmull_gcm_enc_4x) 749 + SYM_FUNC_END(pmull_gcm_enc_4x) 750 750 751 751 .section ".rodata", "a" 752 752 .align 6