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

Commit 19819b8d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.114 (dbcb7486) into msm-4.9"

parents 860b67af f56989ba

Documentation/filesystems/fscrypt.rst

0 → 100644
+626 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/kernel-parameters.txt

+17 −0
Original line number Diff line number Diff line
@@ -4045,6 +4045,23 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	spia_pedr=

	spia_peddr=



	ssbd=		[ARM64,HW]

			Speculative Store Bypass Disable control



			On CPUs that are vulnerable to the Speculative

			Store Bypass vulnerability and offer a

			firmware based mitigation, this parameter

			indicates how the mitigation should be used:



			force-on:  Unconditionally enable mitigation for

				   for both kernel and userspace

			force-off: Unconditionally disable mitigation for

				   for both kernel and userspace

			kernel:    Always enable mitigation in the

				   kernel, and offer a prctl interface

				   to allow userspace to register its

				   interest in being mitigated too.



	stack_guard_gap=	[MM]

			override the default stack gap protection. The value

			is in page units and it defines how many pages prior

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 112

SUBLEVEL = 114

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/include/asm/kvm_host.h

+12 −0
Original line number Diff line number Diff line
@@ -327,4 +327,16 @@ static inline bool kvm_arm_harden_branch_predictor(void) 
	return false;

}



#define KVM_SSBD_UNKNOWN		-1

#define KVM_SSBD_FORCE_DISABLE		0

#define KVM_SSBD_KERNEL		1

#define KVM_SSBD_FORCE_ENABLE		2

#define KVM_SSBD_MITIGATED		3



static inline int kvm_arm_have_ssbd(void)

{

	/* No way to detect it yet, pretend it is not there. */

	return KVM_SSBD_UNKNOWN;

}



#endif /* __ARM_KVM_HOST_H__ */

arch/arm/include/asm/kvm_mmu.h

+12 −0
Original line number Diff line number Diff line
@@ -28,6 +28,13 @@ 
 */

#define kern_hyp_va(kva)	(kva)



/* Contrary to arm64, there is no need to generate a PC-relative address */

#define hyp_symbol_addr(s)						\

	({								\

		typeof(s) *addr = &(s);					\

		addr;							\

	})



/*

 * KVM_MMU_CACHE_MIN_PAGES is the number of stage2 page table translation levels.

 */
@@ -249,6 +256,11 @@ static inline int kvm_map_vectors(void) 
	return 0;

}



static inline int hyp_map_aux_data(void)

{

	return 0;

}



#endif	/* !__ASSEMBLY__ */



#endif /* __ARM_KVM_MMU_H__ */