Merge tag 'v4.4.12' into linux-linaro-lsk-v4.4 (37aa27cf) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/serial/tty.txt

+0 −3

Original line number	Diff line number	Diff line
		@@ -213,9 +213,6 @@ TTY_IO_ERROR If set, causes all subsequent userspace read/write

		TTY_OTHER_CLOSED Device is a pty and the other side has closed.

		TTY_OTHER_DONE Device is a pty and the other side has closed and
		all pending input processing has been completed.

		TTY_NO_WRITE_SPLIT Prevent driver from splitting up writes into
		smaller chunks.

Makefile

+4 −3

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 11
		SUBLEVEL = 12
		EXTRAVERSION =
		NAME = Blurry Fish Butt

		@@ -682,9 +682,10 @@ KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
		KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
		else

		# This warning generated too much noise in a regular build.
		# Use make W=1 to enable this warning (see scripts/Makefile.build)
		# These warnings generated too much noise in a regular build.
		# Use make W=1 to enable them (see scripts/Makefile.build)
		KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
		KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
		endif

		ifdef CONFIG_FRAME_POINTER

arch/arm/kvm/mmu.c

+11 −6

Original line number	Diff line number	Diff line
		@@ -886,11 +886,14 @@ static int stage2_set_pmd_huge(struct kvm *kvm, struct kvm_mmu_memory_cache
		VM_BUG_ON(pmd_present(pmd) && pmd_pfn(pmd) != pmd_pfn(*new_pmd));

		old_pmd = *pmd;
		kvm_set_pmd(pmd, *new_pmd);
		if (pmd_present(old_pmd))
		if (pmd_present(old_pmd)) {
		pmd_clear(pmd);
		kvm_tlb_flush_vmid_ipa(kvm, addr);
		else
		} else {
		get_page(virt_to_page(pmd));
		}

		kvm_set_pmd(pmd, *new_pmd);
		return 0;
		}

		@@ -939,12 +942,14 @@ static int stage2_set_pte(struct kvm kvm, struct kvm_mmu_memory_cache cache,

		/* Create 2nd stage page table mapping - Level 3 */
		old_pte = *pte;
		kvm_set_pte(pte, *new_pte);
		if (pte_present(old_pte))
		if (pte_present(old_pte)) {
		kvm_set_pte(pte, __pte(0));
		kvm_tlb_flush_vmid_ipa(kvm, addr);
		else
		} else {
		get_page(virt_to_page(pte));
		}

		kvm_set_pte(pte, *new_pte);
		return 0;
		}

arch/arm64/include/asm/pgtable-hwdef.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,6 @@
		* Section
		*/
		#define PMD_SECT_VALID (_AT(pmdval_t, 1) << 0)
		#define PMD_SECT_PROT_NONE (_AT(pmdval_t, 1) << 58)
		#define PMD_SECT_USER (_AT(pmdval_t, 1) << 6) /* AP[1] */
		#define PMD_SECT_RDONLY (_AT(pmdval_t, 1) << 7) /* AP[2] */
		#define PMD_SECT_S (_AT(pmdval_t, 3) << 8)

arch/arm64/include/asm/pgtable.h

+20 −5

Original line number	Diff line number	Diff line
		@@ -348,6 +348,7 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
		#endif /* CONFIG_HAVE_RCU_TABLE_FREE */
		#endif /* CONFIG_TRANSPARENT_HUGEPAGE */

		#define pmd_present(pmd) pte_present(pmd_pte(pmd))
		#define pmd_dirty(pmd) pte_dirty(pmd_pte(pmd))
		#define pmd_young(pmd) pte_young(pmd_pte(pmd))
		#define pmd_wrprotect(pmd) pte_pmd(pte_wrprotect(pmd_pte(pmd)))
		@@ -357,7 +358,7 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
		#define pmd_mkclean(pmd) pte_pmd(pte_mkclean(pmd_pte(pmd)))
		#define pmd_mkdirty(pmd) pte_pmd(pte_mkdirty(pmd_pte(pmd)))
		#define pmd_mkyoung(pmd) pte_pmd(pte_mkyoung(pmd_pte(pmd)))
		#define pmd_mknotpresent(pmd) (__pmd(pmd_val(pmd) & ~PMD_TYPE_MASK))
		#define pmd_mknotpresent(pmd) (__pmd(pmd_val(pmd) & ~PMD_SECT_VALID))

		#define __HAVE_ARCH_PMD_WRITE
		#define pmd_write(pmd) pte_write(pmd_pte(pmd))
		@@ -396,7 +397,6 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
		unsigned long size, pgprot_t vma_prot);

		#define pmd_none(pmd) (!pmd_val(pmd))
		#define pmd_present(pmd) (pmd_val(pmd))

		#define pmd_bad(pmd) (!(pmd_val(pmd) & 2))

		@@ -595,6 +595,21 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)
		}

		#ifdef CONFIG_ARM64_HW_AFDBM
		#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
		extern int ptep_set_access_flags(struct vm_area_struct *vma,
		unsigned long address, pte_t *ptep,
		pte_t entry, int dirty);

		#ifdef CONFIG_TRANSPARENT_HUGEPAGE
		#define __HAVE_ARCH_PMDP_SET_ACCESS_FLAGS
		static inline int pmdp_set_access_flags(struct vm_area_struct *vma,
		unsigned long address, pmd_t *pmdp,
		pmd_t entry, int dirty)
		{
		return ptep_set_access_flags(vma, address, (pte_t *)pmdp, pmd_pte(entry), dirty);
		}
		#endif

		/*
		* Atomic pte/pmd modifications.
		*/
		@@ -647,8 +662,8 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
		}

		#ifdef CONFIG_TRANSPARENT_HUGEPAGE
		#define __HAVE_ARCH_PMDP_GET_AND_CLEAR
		static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm,
		#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR
		static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,
		unsigned long address, pmd_t *pmdp)
		{
		return pte_pmd(ptep_get_and_clear(mm, address, (pte_t *)pmdp));