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

Commit 85e1c017 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.48 into android-4.9 



Changes in 4.9.48
	irqchip: mips-gic: SYNC after enabling GIC region
	i2c: ismt: Don't duplicate the receive length for block reads
	i2c: ismt: Return EMSGSIZE for block reads with bogus length
	crypto: algif_skcipher - only call put_page on referenced and used pages
	mm, uprobes: fix multiple free of ->uprobes_state.xol_area
	mm, madvise: ensure poisoned pages are removed from per-cpu lists
	ceph: fix readpage from fscache
	cpumask: fix spurious cpumask_of_node() on non-NUMA multi-node configs
	cpuset: Fix incorrect memory_pressure control file mapping
	alpha: uapi: Add support for __SANE_USERSPACE_TYPES__
	CIFS: Fix maximum SMB2 header size
	CIFS: remove endian related sparse warning
	wl1251: add a missing spin_lock_init()
	lib/mpi: kunmap after finishing accessing buffer
	xfrm: policy: check policy direction value
	drm/ttm: Fix accounting error when fail to get pages for pool
	kvm: arm/arm64: Force reading uncached stage2 PGD
	epoll: fix race between ep_poll_callback(POLLFREE) and ep_free()/ep_remove()
	Linux 4.9.48

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 3b61956a 8a697a50

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 47

SUBLEVEL = 48

EXTRAVERSION =

NAME = Roaring Lionus

arch/alpha/include/asm/types.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _ALPHA_TYPES_H

#define _ALPHA_TYPES_H



#include <asm-generic/int-ll64.h>

#include <uapi/asm/types.h>



#endif /* _ALPHA_TYPES_H */

arch/alpha/include/uapi/asm/types.h

+11 −1
Original line number Diff line number Diff line
@@ -9,8 +9,18 @@ 
 * need to be careful to avoid a name clashes.

 */



#ifndef __KERNEL__

/*

 * This is here because we used to use l64 for alpha

 * and we don't want to impact user mode with our change to ll64

 * in the kernel.

 *

 * However, some user programs are fine with this.  They can

 * flag __SANE_USERSPACE_TYPES__ to get int-ll64.h here.

 */

#if !defined(__SANE_USERSPACE_TYPES__) && !defined(__KERNEL__)

#include <asm-generic/int-l64.h>

#else

#include <asm-generic/int-ll64.h>

#endif



#endif /* _UAPI_ALPHA_TYPES_H */

arch/arm/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ void kvm_free_stage2_pgd(struct kvm *kvm) 
	spin_lock(&kvm->mmu_lock);

	if (kvm->arch.pgd) {

		unmap_stage2_range(kvm, 0, KVM_PHYS_SIZE);

		pgd = kvm->arch.pgd;

		pgd = READ_ONCE(kvm->arch.pgd);

		kvm->arch.pgd = NULL;

	}

	spin_unlock(&kvm->mmu_lock);

crypto/algif_skcipher.c

+7 −2
Original line number Diff line number Diff line
@@ -86,8 +86,13 @@ static void skcipher_free_async_sgls(struct skcipher_async_req *sreq) 
	}

	sgl = sreq->tsg;

	n = sg_nents(sgl);

	for_each_sg(sgl, sg, n, i)

		put_page(sg_page(sg));

	for_each_sg(sgl, sg, n, i) {

		struct page *page = sg_page(sg);



		/* some SGs may not have a page mapped */

		if (page && page_ref_count(page))

			put_page(page);

	}



	kfree(sreq->tsg);

}