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

Commit 18a4d8bf authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents 096461de 822e44b4

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 5

PATCHLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Shy Crocodile



# *DOCUMENTATION*

arch/arm/crypto/sha256-armv4.pl

+2 −1
Original line number Diff line number Diff line
@@ -212,10 +212,11 @@ K256: 
.global	sha256_block_data_order

.type	sha256_block_data_order,%function

sha256_block_data_order:

.Lsha256_block_data_order:

#if __ARM_ARCH__<7

	sub	r3,pc,#8		@ sha256_block_data_order

#else

	adr	r3,sha256_block_data_order

	adr	r3,.Lsha256_block_data_order

#endif

#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)

	ldr	r12,.LOPENSSL_armcap

arch/arm/crypto/sha256-core.S_shipped

+2 −1
Original line number Diff line number Diff line
@@ -93,10 +93,11 @@ K256: 
.global	sha256_block_data_order

.type	sha256_block_data_order,%function

sha256_block_data_order:

.Lsha256_block_data_order:

#if __ARM_ARCH__<7

	sub	r3,pc,#8		@ sha256_block_data_order

#else

	adr	r3,sha256_block_data_order

	adr	r3,.Lsha256_block_data_order

#endif

#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)

	ldr	r12,.LOPENSSL_armcap

arch/arm/crypto/sha512-armv4.pl

+2 −1
Original line number Diff line number Diff line
@@ -274,10 +274,11 @@ WORD64(0x5fcb6fab,0x3ad6faec, 0x6c44198c,0x4a475817) 
.global	sha512_block_data_order

.type	sha512_block_data_order,%function

sha512_block_data_order:

.Lsha512_block_data_order:

#if __ARM_ARCH__<7

	sub	r3,pc,#8		@ sha512_block_data_order

#else

	adr	r3,sha512_block_data_order

	adr	r3,.Lsha512_block_data_order

#endif

#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)

	ldr	r12,.LOPENSSL_armcap

arch/arm/crypto/sha512-core.S_shipped

+2 −1
Original line number Diff line number Diff line
@@ -141,10 +141,11 @@ WORD64(0x5fcb6fab,0x3ad6faec, 0x6c44198c,0x4a475817) 
.global	sha512_block_data_order

.type	sha512_block_data_order,%function

sha512_block_data_order:

.Lsha512_block_data_order:

#if __ARM_ARCH__<7

	sub	r3,pc,#8		@ sha512_block_data_order

#else

	adr	r3,sha512_block_data_order

	adr	r3,.Lsha512_block_data_order

#endif

#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)

	ldr	r12,.LOPENSSL_armcap