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

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

Merge "Merge branch 'android-4.4@e4528dd' into branch 'msm-4.4'"

parents bf5ab4a6 95a027ea

Documentation/sysctl/fs.txt

+7 −0
Original line number Diff line number Diff line
@@ -265,6 +265,13 @@ aio-nr can grow to. 


==============================================================



mount-max:



This denotes the maximum number of mounts that may exist

in a mount namespace.



==============================================================





2. /proc/sys/fs/binfmt_misc

----------------------------------------------------------

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 63

SUBLEVEL = 65

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/kvm/mmu.c

+12 −0
Original line number Diff line number Diff line
@@ -301,6 +301,14 @@ static void unmap_range(struct kvm *kvm, pgd_t *pgdp, 
		next = kvm_pgd_addr_end(addr, end);

		if (!pgd_none(*pgd))

			unmap_puds(kvm, pgd, addr, next);

		/*

		 * If we are dealing with a large range in

		 * stage2 table, release the kvm->mmu_lock

		 * to prevent starvation and lockup detector

		 * warnings.

		 */

		if (kvm && (next != end))

			cond_resched_lock(&kvm->mmu_lock);

	} while (pgd++, addr = next, addr != end);

}
@@ -745,6 +753,7 @@ int kvm_alloc_stage2_pgd(struct kvm *kvm) 
 */

static void unmap_stage2_range(struct kvm *kvm, phys_addr_t start, u64 size)

{

	assert_spin_locked(&kvm->mmu_lock);

	unmap_range(kvm, kvm->arch.pgd, start, size);

}
@@ -831,7 +840,10 @@ void kvm_free_stage2_pgd(struct kvm *kvm) 
	if (kvm->arch.pgd == NULL)

		return;



	spin_lock(&kvm->mmu_lock);

	unmap_stage2_range(kvm, 0, KVM_PHYS_SIZE);

	spin_unlock(&kvm->mmu_lock);



	kvm_free_hwpgd(kvm_get_hwpgd(kvm));

	if (KVM_PREALLOC_LEVEL > 0)

		kfree(kvm->arch.pgd);

arch/powerpc/kernel/entry_64.S

+3 −3
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ resume_kernel: 


	addi	r8,r1,INT_FRAME_SIZE	/* Get the kprobed function entry */



	lwz	r3,GPR1(r1)

	ld	r3,GPR1(r1)

	subi	r3,r3,INT_FRAME_SIZE	/* dst: Allocate a trampoline exception frame */

	mr	r4,r1			/* src:  current exception frame */

	mr	r1,r3			/* Reroute the trampoline frame to r1 */
@@ -730,8 +730,8 @@ resume_kernel: 
	addi	r6,r6,8

	bdnz	2b



	/* Do real store operation to complete stwu */

	lwz	r5,GPR1(r1)

	/* Do real store operation to complete stdu */

	ld	r5,GPR1(r1)

	std	r8,0(r5)



	/* Clear _TIF_EMULATE_STACK_STORE flag */

arch/s390/include/asm/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -829,6 +829,8 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, 
{

	pgste_t pgste;



	if (pte_present(entry))

		pte_val(entry) &= ~_PAGE_UNUSED;

	if (mm_has_pgste(mm)) {

		pgste = pgste_get_lock(ptep);

		pgste_val(pgste) &= ~_PGSTE_GPS_ZERO;