Commit 57c54ef5 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

parents 0d3c5fea 1a059243

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 = 57

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ endif 


KBUILD_CFLAGS	+= -mgeneral-regs-only $(lseinstr) $(brokengasinst)

KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables

KBUILD_CFLAGS	+= -Wno-psabi

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;

}

arch/arm64/include/asm/insn.h

+8 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ __AARCH64_INSN_FUNCS(adrp, 0x9F000000, 0x90000000) 
__AARCH64_INSN_FUNCS(prfm,	0x3FC00000, 0x39800000)

__AARCH64_INSN_FUNCS(prfm_lit,	0xFF000000, 0xD8000000)

__AARCH64_INSN_FUNCS(str_reg,	0x3FE0EC00, 0x38206800)

__AARCH64_INSN_FUNCS(ldadd,	0x3F20FC00, 0x38200000)

__AARCH64_INSN_FUNCS(ldr_reg,	0x3FE0EC00, 0x38606800)

__AARCH64_INSN_FUNCS(ldr_lit,	0xBF000000, 0x18000000)

__AARCH64_INSN_FUNCS(ldrsw_lit,	0xFF000000, 0x98000000)
@@ -389,6 +390,13 @@ u32 aarch64_insn_gen_load_store_ex(enum aarch64_insn_register reg, 
				   enum aarch64_insn_register state,

				   enum aarch64_insn_size_type size,

				   enum aarch64_insn_ldst_type type);

u32 aarch64_insn_gen_ldadd(enum aarch64_insn_register result,

			   enum aarch64_insn_register address,

			   enum aarch64_insn_register value,

			   enum aarch64_insn_size_type size);

u32 aarch64_insn_gen_stadd(enum aarch64_insn_register address,

			   enum aarch64_insn_register value,

			   enum aarch64_insn_size_type size);

u32 aarch64_insn_gen_add_sub_imm(enum aarch64_insn_register dst,

				 enum aarch64_insn_register src,

				 int imm, enum aarch64_insn_variant variant,