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

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

Merge "Merge android-4.19.58 (5ad6eeba) into msm-4.19"

parents 80eeb91a 053efa6d

Documentation/robust-futexes.txt

+1 −2
Original line number Diff line number Diff line
@@ -218,5 +218,4 @@ All other architectures should build just fine too - but they won't have 
the new syscalls yet.



Architectures need to implement the new futex_atomic_cmpxchg_inatomic()

inline function before writing up the syscalls (that function returns

-ENOSYS right now).
 
inline function before writing up the syscalls.

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 56

SUBLEVEL = 58

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/armada-xp-98dx3236.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -336,3 +336,11 @@ 
	status = "disabled";

};



&uart0 {

	compatible = "marvell,armada-38x-uart";

};



&uart1 {

	compatible = "marvell,armada-38x-uart";

};

arch/arm64/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -56,9 +56,7 @@ KBUILD_CFLAGS += -mgeneral-regs-only 
endif

KBUILD_CFLAGS	+= $(lseinstr) $(brokengasinst)

KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables

ifeq ($(cc-name),gcc)

KBUILD_CFLAGS	+= -Wno-psabi

endif

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

KBUILD_AFLAGS	+= $(lseinstr) $(brokengasinst)



KBUILD_CFLAGS	+= $(call cc-option,-mabi=lp64)

arch/arm64/include/asm/futex.h

+3 −1
Original line number Diff line number Diff line
@@ -134,7 +134,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *_uaddr, 
	: "memory");

	uaccess_disable();



	if (!ret)

		*uval = val;



	return ret;

}