Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4fba88d 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 regression that causes sha-mb to crash"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: sha1-mb - make sha1_x8_avx2() conform to C function ABI
parents ffd565e3 4a6b27b7

arch/x86/crypto/sha-mb/sha1_x8_avx2.S

+11 −2
Original line number Diff line number Diff line
@@ -296,7 +296,11 @@ W14 = TMP_ 
#

ENTRY(sha1_x8_avx2)



	push	RSP_SAVE

	# save callee-saved clobbered registers to comply with C function ABI

	push	%r12

	push	%r13

	push	%r14

	push	%r15



	#save rsp

	mov	%rsp, RSP_SAVE
@@ -446,7 +450,12 @@ lloop: 
	## Postamble



	mov     RSP_SAVE, %rsp

	pop	RSP_SAVE



	# restore callee-saved clobbered registers

	pop	%r15

	pop	%r14

	pop	%r13

	pop	%r12



	ret

ENDPROC(sha1_x8_avx2)