Re: [GIT PULL] x86/asm changes for v5.5

[Ingo Molnar]

* Ingo Molnar <mingo@xxxxxxxxxx> wrote:

> Linus,
> 
> Please pull the latest x86-asm-for-linus git tree from:
> 
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-asm-for-linus
> 
>    # HEAD: f01ec4fca8207e31b59a010c3de679c833f3a877 Merge branch 'x86/build' into x86/asm, to pick up completed topic branch

> Unfortunately the symbol rework will generate conflicts with pending 
> changes to assembly files.

Here's a more detailed merge conflict note, the changes will create 
direct merge conflicts in these files:

  arch/x86/entry/entry_32.S
  arch/x86/kernel/head_32.S
  arch/x86/xen/xen-asm_32.S

These are straightforward to resolve, but there's a semantic conflict as 
well, due to this new commit you already merged via the crypto tree:

  ed0356eda153: ("crypto: blake2s - x86_64 SIMD implementation")

Which can be resolved via converting ENTRY/ENDPROC to 
SYM_FUNC_START/SYM_FUNC_END() pattern via the patch below.

Thanks,

	Ingo

====================>

 arch/x86/crypto/blake2s-core.S | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/crypto/blake2s-core.S b/arch/x86/crypto/blake2s-core.S
index 8591938eee26..24910b766bdd 100644
--- a/arch/x86/crypto/blake2s-core.S
+++ b/arch/x86/crypto/blake2s-core.S
@@ -47,7 +47,7 @@ SIGMA2:
 
 .text
 #ifdef CONFIG_AS_SSSE3
-ENTRY(blake2s_compress_ssse3)
+SYM_FUNC_START(blake2s_compress_ssse3)
 	testq		%rdx,%rdx
 	je		.Lendofloop
 	movdqu		(%rdi),%xmm0
@@ -173,11 +173,11 @@ ENTRY(blake2s_compress_ssse3)
 	movdqu		%xmm14,0x20(%rdi)
 .Lendofloop:
 	ret
-ENDPROC(blake2s_compress_ssse3)
+SYM_FUNC_END(blake2s_compress_ssse3)
 #endif /* CONFIG_AS_SSSE3 */
 
 #ifdef CONFIG_AS_AVX512
-ENTRY(blake2s_compress_avx512)
+SYM_FUNC_START(blake2s_compress_avx512)
 	vmovdqu		(%rdi),%xmm0
 	vmovdqu		0x10(%rdi),%xmm1
 	vmovdqu		0x20(%rdi),%xmm4
@@ -254,5 +254,5 @@ ENTRY(blake2s_compress_avx512)
 	vmovdqu		%xmm4,0x20(%rdi)
 	vzeroupper
 	retq
-ENDPROC(blake2s_compress_avx512)
+SYM_FUNC_END(blake2s_compress_avx512)
 #endif /* CONFIG_AS_AVX512 */