On 4/8/19 4:34 PM, Sedat Dilek wrote:
v2:sdi@iniza:~/src/linux-kernel/linux$ git --no-pager diff diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S index a14af6eb09cb..712d6a7e8b8f 100644 --- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S +++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S @@ -573,8 +573,12 @@ ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab) vmovdqu y7, 15 * 16(rio); -/* NB: section is mergeable, all elements must be aligned 16-byte blocks */ -.section .rodata.cst16, "aM", @progbits, 16 +/* + * NB: section is mergeable, all elements must be aligned 16-byte blocks + * There is more than one object in this section, let's use module name + * instead of object name as unique suffix + */ +.section .rodata.cst16.camellia_aesni_avx_asm_64, "aM", @progbits, 16 .align 16 #define SHUFB_BYTES(idx) \ diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S index b66bbfa62f50..34f6b0c4196d 100644 --- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S +++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S @@ -626,8 +626,12 @@ ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab) .long 0x00010203, 0x04050607, 0x80808080, 0x80808080 .long 0x00010203, 0x04050607, 0x80808080, 0x80808080 -/* NB: section is mergeable, all elements must be aligned 16-byte blocks */ -.section .rodata.cst16, "aM", @progbits, 16 +/* + * NB: section is mergeable, all elements must be aligned 16-byte blocks + * There is more than one object in this section, let's use module name + * instead of object name as unique suffix +*/ +.section .rodata.cst16.ccamellia_aesni_avx2_asm_64, "aM", @progbits, 16
why "ccamellia", not "camellia"?
I tried to check for the .rodata.cst32 case, how do I identify the *.S files?
? Looks like all .rodata.cst32 sections have suffixes, nothing to fix.
