enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/x86/crypto/camellia-x86_64-asm_64.S
..
..
@@ -1,23 +1,8 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
1
2
 /*
2
3
  * Camellia Cipher Algorithm (x86_64)
3
4
  *
4
5
  * Copyright (C) 2012 Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation; either version 2 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program; if not, write to the Free Software
18
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19
- * USA
20
- *
21
6
  */
22
7
 
23
8
 #include <linux/linkage.h>
..
..
@@ -190,7 +175,7 @@
190
175
 	bswapq				RAB0; \
191
176
 	movq RAB0,			4*2(RIO);
192
177
 
193
-ENTRY(__camellia_enc_blk)
178
+SYM_FUNC_START(__camellia_enc_blk)
194
179
 	/* input:
195
180
 	 *	%rdi: ctx, CTX
196
181
 	 *	%rsi: dst
..
..
@@ -228,16 +213,16 @@
228
213
 	enc_outunpack(mov, RT1);
229
214
 
230
215
 	movq RR12, %r12;
231
-	ret;
216
+	RET;
232
217
 
233
218
 .L__enc_xor:
234
219
 	enc_outunpack(xor, RT1);
235
220
 
236
221
 	movq RR12, %r12;
237
-	ret;
238
-ENDPROC(__camellia_enc_blk)
222
+	RET;
223
+SYM_FUNC_END(__camellia_enc_blk)
239
224
 
240
-ENTRY(camellia_dec_blk)
225
+SYM_FUNC_START(camellia_dec_blk)
241
226
 	/* input:
242
227
 	 *	%rdi: ctx, CTX
243
228
 	 *	%rsi: dst
..
..
@@ -272,8 +257,8 @@
272
257
 	dec_outunpack();
273
258
 
274
259
 	movq RR12, %r12;
275
-	ret;
276
-ENDPROC(camellia_dec_blk)
260
+	RET;
261
+SYM_FUNC_END(camellia_dec_blk)
277
262
 
278
263
 /**********************************************************************
279
264
   2-way camellia
..
..
@@ -424,7 +409,7 @@
424
409
 		bswapq				RAB1; \
425
410
 		movq RAB1,			12*2(RIO);
426
411
 
427
-ENTRY(__camellia_enc_blk_2way)
412
+SYM_FUNC_START(__camellia_enc_blk_2way)
428
413
 	/* input:
429
414
 	 *	%rdi: ctx, CTX
430
415
 	 *	%rsi: dst
..
..
@@ -463,17 +448,17 @@
463
448
 
464
449
 	movq RR12, %r12;
465
450
 	popq %rbx;
466
-	ret;
451
+	RET;
467
452
 
468
453
 .L__enc2_xor:
469
454
 	enc_outunpack2(xor, RT2);
470
455
 
471
456
 	movq RR12, %r12;
472
457
 	popq %rbx;
473
-	ret;
474
-ENDPROC(__camellia_enc_blk_2way)
458
+	RET;
459
+SYM_FUNC_END(__camellia_enc_blk_2way)
475
460
 
476
-ENTRY(camellia_dec_blk_2way)
461
+SYM_FUNC_START(camellia_dec_blk_2way)
477
462
 	/* input:
478
463
 	 *	%rdi: ctx, CTX
479
464
 	 *	%rsi: dst
..
..
@@ -510,5 +495,5 @@
510
495
 
511
496
 	movq RR12, %r12;
512
497
 	movq RXOR, %rbx;
513
-	ret;
514
-ENDPROC(camellia_dec_blk_2way)
498
+	RET;
499
+SYM_FUNC_END(camellia_dec_blk_2way)