Merge "Merge android-4.4.150 (5541782) into msm-4.4" (4036bbe4) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/Changes

+6 −11

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ o GNU C 3.2 # gcc --version
		o GNU make 3.80 # make --version
		o binutils 2.12 # ld -v
		o util-linux 2.10o # fdformat --version
		o module-init-tools 0.9.10 # depmod -V
		o kmod 13 # depmod -V
		o e2fsprogs 1.41.4 # e2fsck -V
		o jfsutils 1.1.3 # fsck.jfs -V
		o reiserfsprogs 3.6.3 # reiserfsck -V
		@@ -132,12 +132,6 @@ is not build with CONFIG_KALLSYMS and you have no way to rebuild and
		reproduce the Oops with that option, then you can still decode that Oops
		with ksymoops.

		Module-Init-Tools
		-----------------

		A new module loader is now in the kernel that requires module-init-tools
		to use. It is backward compatible with the 2.4.x series kernels.

		Mkinitrd
		--------

		@@ -319,14 +313,15 @@ Util-linux
		----------
		o <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>

		Kmod
		----
		o <https://www.kernel.org/pub/linux/utils/kernel/kmod/>
		o <https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git>

		Ksymoops
		--------
		o <ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/>

		Module-Init-Tools
		-----------------
		o <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/>

		Mkinitrd
		--------
		o <https://code.launchpad.net/initrd-tools/main>

Makefile

+4 −2

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 148
		SUBLEVEL = 150
		EXTRAVERSION =
		NAME = Blurry Fish Butt

		@@ -425,7 +425,9 @@ export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE
		export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS

		export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
		export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV CFLAGS_KCOV CFLAGS_KASAN CFLAGS_UBSAN
		export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV
		export CFLAGS_KASAN CFLAGS_UBSAN CFLAGS_KASAN_NOSANITIZE
		export CFLAGS_KCOV
		export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
		export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
		export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL

arch/arm64/mm/mmu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1373,12 +1373,12 @@ int pmd_clear_huge(pmd_t *pmd)
		}

		#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
		int pud_free_pmd_page(pud_t *pud)
		int pud_free_pmd_page(pud_t *pud, unsigned long addr)
		{
		return pud_none(*pud);
		}

		int pmd_free_pte_page(pmd_t *pmd)
		int pmd_free_pte_page(pmd_t *pmd, unsigned long addr)
		{
		return pmd_none(*pmd);
		}

arch/x86/include/asm/pgtable-invert.h

+10 −1

Original line number	Diff line number	Diff line
		@@ -4,9 +4,18 @@

		#ifndef __ASSEMBLY__

		/*
		* A clear pte value is special, and doesn't get inverted.
		*
		* Note that even users that only pass a pgprot_t (rather
		* than a full pte) won't trigger the special zero case,
		* because even PAGE_NONE has _PAGE_PROTNONE \| _PAGE_ACCESSED
		* set. So the all zero case really is limited to just the
		* cleared page table entry case.
		*/
		static inline bool __pte_needs_invert(u64 val)
		{
		return !(val & _PAGE_PRESENT);
		return val && !(val & _PAGE_PRESENT);
		}

		/* Get a mask to xor with the page table entry to get the correct pfn. */

arch/x86/mm/pgtable.c

+53 −8

Original line number	Diff line number	Diff line
		@@ -676,28 +676,50 @@ int pmd_clear_huge(pmd_t *pmd)
		return 0;
		}

		#ifdef CONFIG_X86_64
		/**
		* pud_free_pmd_page - Clear pud entry and free pmd page.
		* @pud: Pointer to a PUD.
		* @addr: Virtual address associated with pud.
		*
		* Context: The pud range has been unmaped and TLB purged.
		* Context: The pud range has been unmapped and TLB purged.
		* Return: 1 if clearing the entry succeeded. 0 otherwise.
		*
		* NOTE: Callers must allow a single page allocation.
		*/
		int pud_free_pmd_page(pud_t *pud)
		int pud_free_pmd_page(pud_t *pud, unsigned long addr)
		{
		pmd_t *pmd;
		pmd_t pmd, pmd_sv;
		pte_t *pte;
		int i;

		if (pud_none(*pud))
		return 1;

		pmd = (pmd_t )pud_page_vaddr(pud);

		for (i = 0; i < PTRS_PER_PMD; i++)
		if (!pmd_free_pte_page(&pmd[i]))
		pmd_sv = (pmd_t *)__get_free_page(GFP_KERNEL);
		if (!pmd_sv)
		return 0;

		for (i = 0; i < PTRS_PER_PMD; i++) {
		pmd_sv[i] = pmd[i];
		if (!pmd_none(pmd[i]))
		pmd_clear(&pmd[i]);
		}

		pud_clear(pud);

		/* INVLPG to clear all paging-structure caches */
		flush_tlb_kernel_range(addr, addr + PAGE_SIZE-1);

		for (i = 0; i < PTRS_PER_PMD; i++) {
		if (!pmd_none(pmd_sv[i])) {
		pte = (pte_t *)pmd_page_vaddr(pmd_sv[i]);
		free_page((unsigned long)pte);
		}
		}

		free_page((unsigned long)pmd_sv);
		free_page((unsigned long)pmd);

		return 1;
		@@ -706,11 +728,12 @@ int pud_free_pmd_page(pud_t *pud)
		/**
		* pmd_free_pte_page - Clear pmd entry and free pte page.
		* @pmd: Pointer to a PMD.
		* @addr: Virtual address associated with pmd.
		*
		* Context: The pmd range has been unmaped and TLB purged.
		* Context: The pmd range has been unmapped and TLB purged.
		* Return: 1 if clearing the entry succeeded. 0 otherwise.
		*/
		int pmd_free_pte_page(pmd_t *pmd)
		int pmd_free_pte_page(pmd_t *pmd, unsigned long addr)
		{
		pte_t *pte;

		@@ -719,8 +742,30 @@ int pmd_free_pte_page(pmd_t *pmd)

		pte = (pte_t )pmd_page_vaddr(pmd);
		pmd_clear(pmd);

		/* INVLPG to clear all paging-structure caches */
		flush_tlb_kernel_range(addr, addr + PAGE_SIZE-1);

		free_page((unsigned long)pte);

		return 1;
		}

		#else /* !CONFIG_X86_64 */

		int pud_free_pmd_page(pud_t *pud, unsigned long addr)
		{
		return pud_none(*pud);
		}

		/*
		* Disable free page handling on x86-PAE. This assures that ioremap()
		* does not update sync'd pmd entries. See vmalloc_sync_one().
		*/
		int pmd_free_pte_page(pmd_t *pmd, unsigned long addr)
		{
		return pmd_none(*pmd);
		}

		#endif /* CONFIG_X86_64 */
		#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */