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

Commit 6dba045d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19.37 (9bf59048) into msm-4.19"

parents 0b7ea909 3fc4c60d

Makefile

+2 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 36

SUBLEVEL = 37

EXTRAVERSION =

NAME = "People's Front"
@@ -662,8 +662,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) 
KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= $(call cc-option,-Oz,-Os)

KBUILD_CFLAGS	+= $(call cc-disable-warning,maybe-uninitialized,)

KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)

else

ifdef CONFIG_PROFILE_ALL_BRANCHES

KBUILD_CFLAGS	+= -O2 $(call cc-disable-warning,maybe-uninitialized,)

arch/arm64/configs/cuttlefish_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_INTERFACE=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

arch/arm64/include/asm/futex.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ do { \ 
static inline int

arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *_uaddr)

{

	int oldval, ret, tmp;

	int oldval = 0, ret, tmp;

	u32 __user *uaddr = __uaccess_mask_ptr(_uaddr);



	pagefault_disable();

arch/x86/configs/x86_64_cuttlefish_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_INTERFACE=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

arch/x86/crypto/poly1305-avx2-x86_64.S

+10 −4
Original line number Diff line number Diff line
@@ -323,6 +323,12 @@ ENTRY(poly1305_4block_avx2) 
	vpaddq		t2,t1,t1

	vmovq		t1x,d4



	# Now do a partial reduction mod (2^130)-5, carrying h0 -> h1 -> h2 ->

	# h3 -> h4 -> h0 -> h1 to get h0,h2,h3,h4 < 2^26 and h1 < 2^26 + a small

	# amount.  Careful: we must not assume the carry bits 'd0 >> 26',

	# 'd1 >> 26', 'd2 >> 26', 'd3 >> 26', and '(d4 >> 26) * 5' fit in 32-bit

	# integers.  It's true in a single-block implementation, but not here.



	# d1 += d0 >> 26

	mov		d0,%rax

	shr		$26,%rax
@@ -361,16 +367,16 @@ ENTRY(poly1305_4block_avx2) 
	# h0 += (d4 >> 26) * 5

	mov		d4,%rax

	shr		$26,%rax

	lea		(%eax,%eax,4),%eax

	add		%eax,%ebx

	lea		(%rax,%rax,4),%rax

	add		%rax,%rbx

	# h4 = d4 & 0x3ffffff

	mov		d4,%rax

	and		$0x3ffffff,%eax

	mov		%eax,h4



	# h1 += h0 >> 26

	mov		%ebx,%eax

	shr		$26,%eax

	mov		%rbx,%rax

	shr		$26,%rax

	add		%eax,h1

	# h0 = h0 & 0x3ffffff

	andl		$0x3ffffff,%ebx