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

Commit 54e30167 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4 into android-mainline 



Linux 5.4

Here we go!

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Iee409f3bbf65b93fa419e5b09818efb8e56569fd
parents 00c013f4 219d5433

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ F: drivers/net/ethernet/alacritech/* 








FORCEDETH GIGABIT ETHERNET DRIVER









M:	Rain River <rain.1986.08.12@gmail.com>









M:	Zhu Yanjun <yanjun.zhu@oracle.com>









M:	Zhu Yanjun <zyjzyj2000@gmail.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/ethernet/nvidia/*








@@ -17215,6 +17215,7 @@ F:	virt/lib/















VIRTIO AND VHOST VSOCK DRIVER









M:	Stefan Hajnoczi <stefanha@redhat.com>









M:	Stefano Garzarella <sgarzare@redhat.com>









L:	kvm@vger.kernel.org









L:	virtualization@lists.linux-foundation.org









L:	netdev@vger.kernel.org
































Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 5









PATCHLEVEL = 4









SUBLEVEL = 0









EXTRAVERSION = -rc8









EXTRAVERSION =









NAME = Kleptomaniac Octopus



















# *DOCUMENTATION*
































arch/arm64/include/asm/asm-uaccess.h



+0
−17






























Original line number
Diff line number
Diff line







@@ -58,23 +58,6 @@ alternative_else_nop_endif







	.endm









#endif



















/*









 * These macros are no-ops when UAO is present.









 */









	.macro	uaccess_disable_not_uao, tmp1, tmp2









	uaccess_ttbr0_disable \tmp1, \tmp2









alternative_if ARM64_ALT_PAN_NOT_UAO









	SET_PSTATE_PAN(1)









alternative_else_nop_endif









	.endm



















	.macro	uaccess_enable_not_uao, tmp1, tmp2, tmp3









	uaccess_ttbr0_enable \tmp1, \tmp2, \tmp3









alternative_if ARM64_ALT_PAN_NOT_UAO









	SET_PSTATE_PAN(0)









alternative_else_nop_endif









	.endm



















/*









 * Remove the address tag from a virtual address, if present.









 */
































arch/arm64/include/asm/uaccess.h



+22
−5






























Original line number
Diff line number
Diff line







@@ -378,20 +378,34 @@ do {									\







extern unsigned long __must_check __arch_copy_from_user(void *to, const void __user *from, unsigned long n);









#define raw_copy_from_user(to, from, n)					\









({									\









	__arch_copy_from_user((to), __uaccess_mask_ptr(from), (n));	\









	unsigned long __acfu_ret;					\









	uaccess_enable_not_uao();					\









	__acfu_ret = __arch_copy_from_user((to),			\









				      __uaccess_mask_ptr(from), (n));	\









	uaccess_disable_not_uao();					\









	__acfu_ret;							\









})



















extern unsigned long __must_check __arch_copy_to_user(void __user *to, const void *from, unsigned long n);









#define raw_copy_to_user(to, from, n)					\









({									\









	__arch_copy_to_user(__uaccess_mask_ptr(to), (from), (n));	\









	unsigned long __actu_ret;					\









	uaccess_enable_not_uao();					\









	__actu_ret = __arch_copy_to_user(__uaccess_mask_ptr(to),	\









				    (from), (n));			\









	uaccess_disable_not_uao();					\









	__actu_ret;							\









})



















extern unsigned long __must_check __arch_copy_in_user(void __user *to, const void __user *from, unsigned long n);









#define raw_copy_in_user(to, from, n)					\









({									\









	__arch_copy_in_user(__uaccess_mask_ptr(to),			\









	unsigned long __aciu_ret;					\









	uaccess_enable_not_uao();					\









	__aciu_ret = __arch_copy_in_user(__uaccess_mask_ptr(to),	\









				    __uaccess_mask_ptr(from), (n));	\









	uaccess_disable_not_uao();					\









	__aciu_ret;							\









})



















#define INLINE_COPY_TO_USER








@@ -400,8 +414,11 @@ extern unsigned long __must_check __arch_copy_in_user(void __user *to, const voi







extern unsigned long __must_check __arch_clear_user(void __user *to, unsigned long n);









static inline unsigned long __must_check __clear_user(void __user *to, unsigned long n)









{









	if (access_ok(to, n))









	if (access_ok(to, n)) {









		uaccess_enable_not_uao();









		n = __arch_clear_user(__uaccess_mask_ptr(to), n);









		uaccess_disable_not_uao();









	}









	return n;









}









#define clear_user	__clear_user
































arch/arm64/lib/clear_user.S



+0
−2






























Original line number
Diff line number
Diff line







@@ -20,7 +20,6 @@







 * Alignment fixed up by hardware.









 */









ENTRY(__arch_clear_user)









	uaccess_enable_not_uao x2, x3, x4









	mov	x2, x1			// save the size for fixup return









	subs	x1, x1, #8









	b.mi	2f








@@ -40,7 +39,6 @@ uao_user_alternative 9f, strh, sttrh, wzr, x0, 2







	b.mi	5f









uao_user_alternative 9f, strb, sttrb, wzr, x0, 0









5:	mov	x0, #0









	uaccess_disable_not_uao x2, x3









	ret









ENDPROC(__arch_clear_user)









EXPORT_SYMBOL(__arch_clear_user)