Commit 75c7a6c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "Fix a build-time warning in x86/sm4"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/sm4 - Fix invalid section entry size
parents 2c04d67e f8690a4b

arch/x86/crypto/sm4-aesni-avx-asm_64.S

+5 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
	vpxor tmp0, x, x;





.section	.rodata.cst164, "aM", @progbits, 164

.section	.rodata.cst16, "aM", @progbits, 16

.align 16



/*
@@ -133,6 +133,10 @@ 
.L0f0f0f0f:

	.long 0x0f0f0f0f



/* 12 bytes, only for padding */

.Lpadding_deadbeef:

	.long 0xdeadbeef, 0xdeadbeef, 0xdeadbeef





.text

.align 16

arch/x86/crypto/sm4-aesni-avx2-asm_64.S

+5 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
	vpxor tmp0, x, x;





.section	.rodata.cst164, "aM", @progbits, 164

.section	.rodata.cst16, "aM", @progbits, 16

.align 16



/*
@@ -148,6 +148,10 @@ 
.L0f0f0f0f:

	.long 0x0f0f0f0f



/* 12 bytes, only for padding */

.Lpadding_deadbeef:

	.long 0xdeadbeef, 0xdeadbeef, 0xdeadbeef



.text

.align 16