Skip to content

Commit b5f3c99

Browse files
hcahcaVasily Gorbik
authored andcommitted
s390/crc32le: use SYM* macros instead of ENTRY(), etc.
Consistently use the SYM* family of macros instead of the deprecated ENTRY(), ENDPROC(), etc. family of macros. Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent 4b788ac commit b5f3c99

1 file changed

Lines changed: 16 additions & 14 deletions

File tree

arch/s390/crypto/crc32le-vx.S

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#define CONST_RU_POLY %v13
2626
#define CONST_CRC_POLY %v14
2727

28-
.data
29-
.align 8
28+
.data
29+
.balign 8
3030

3131
/*
3232
* The CRC-32 constant block contains reduction constants to fold and
@@ -59,27 +59,29 @@
5959
* P'(x) = 0x82F63B78
6060
*/
6161

62-
.Lconstants_CRC_32_LE:
62+
SYM_DATA_START_LOCAL(constants_CRC_32_LE)
6363
.octa 0x0F0E0D0C0B0A09080706050403020100 # BE->LE mask
6464
.quad 0x1c6e41596, 0x154442bd4 # R2, R1
6565
.quad 0x0ccaa009e, 0x1751997d0 # R4, R3
6666
.octa 0x163cd6124 # R5
6767
.octa 0x1F7011641 # u'
6868
.octa 0x1DB710641 # P'(x) << 1
69+
SYM_DATA_END(constants_CRC_32_LE)
6970

70-
.Lconstants_CRC_32C_LE:
71+
SYM_DATA_START_LOCAL(constants_CRC_32C_LE)
7172
.octa 0x0F0E0D0C0B0A09080706050403020100 # BE->LE mask
7273
.quad 0x09e4addf8, 0x740eef02 # R2, R1
7374
.quad 0x14cd00bd6, 0xf20c0dfe # R4, R3
7475
.octa 0x0dd45aab8 # R5
7576
.octa 0x0dea713f1 # u'
7677
.octa 0x105ec76f0 # P'(x) << 1
78+
SYM_DATA_END(constants_CRC_32C_LE)
7779

78-
.previous
80+
.previous
7981

8082
GEN_BR_THUNK %r14
8183

82-
.text
84+
.text
8385

8486
/*
8587
* The CRC-32 functions use these calling conventions:
@@ -102,17 +104,17 @@
102104
* V10..V14: CRC-32 constants.
103105
*/
104106

105-
ENTRY(crc32_le_vgfm_16)
106-
larl %r5,.Lconstants_CRC_32_LE
107+
SYM_FUNC_START(crc32_le_vgfm_16)
108+
larl %r5,constants_CRC_32_LE
107109
j crc32_le_vgfm_generic
108-
ENDPROC(crc32_le_vgfm_16)
110+
SYM_FUNC_END(crc32_le_vgfm_16)
109111

110-
ENTRY(crc32c_le_vgfm_16)
111-
larl %r5,.Lconstants_CRC_32C_LE
112+
SYM_FUNC_START(crc32c_le_vgfm_16)
113+
larl %r5,constants_CRC_32C_LE
112114
j crc32_le_vgfm_generic
113-
ENDPROC(crc32c_le_vgfm_16)
115+
SYM_FUNC_END(crc32c_le_vgfm_16)
114116

115-
ENTRY(crc32_le_vgfm_generic)
117+
SYM_FUNC_START(crc32_le_vgfm_generic)
116118
/* Load CRC-32 constants */
117119
VLM CONST_PERM_LE2BE,CONST_CRC_POLY,0,%r5
118120

@@ -268,6 +270,6 @@ ENTRY(crc32_le_vgfm_generic)
268270
.Ldone:
269271
VLGVF %r2,%v2,2
270272
BR_EX %r14
271-
ENDPROC(crc32_le_vgfm_generic)
273+
SYM_FUNC_END(crc32_le_vgfm_generic)
272274

273275
.previous

0 commit comments

Comments
 (0)