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

Commit 086e3eb6 authored Jun 24, 2016 by Linus Torvalds

Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "Two weeks worth of fixes here"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (41 commits)
  init/main.c: fix initcall_blacklisted on ia64, ppc64 and parisc64
  autofs: don't get stuck in a loop if vfs_write() returns an error
  mm/page_owner: avoid null pointer dereference
  tools/vm/slabinfo: fix spelling mistake: "Ocurrences" -> "Occurrences"
  fs/nilfs2: fix potential underflow in call to crc32_le
  oom, suspend: fix oom_reaper vs. oom_killer_disable race
  ocfs2: disable BUG assertions in reading blocks
  mm, compaction: abort free scanner if split fails
  mm: prevent KASAN false positives in kmemleak
  mm/hugetlb: clear compound_mapcount when freeing gigantic pages
  mm/swap.c: flush lru pvecs on compound page arrival
  memcg: css_alloc should return an ERR_PTR value on error
  memcg: mem_cgroup_migrate() may be called with irq disabled
  hugetlb: fix nr_pmds accounting with shared page tables
  Revert "mm: disable fault around on emulated access bit architecture"
  Revert "mm: make faultaround produce old ptes"
  mailmap: add Boris Brezillon's email
  mailmap: add Antoine Tenart's email
  mm, sl[au]b: add __GFP_ATOMIC to the GFP reclaim mask
  mm: mempool: kasan: don't poot mempool objects in quarantine
  ...

parents aebe9bb8 0fd5ed8d

.mailmap

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
	Andrew Morton <akpm@linux-foundation.org>		Andrew Morton <akpm@linux-foundation.org>
	Andrew Vasquez <andrew.vasquez@qlogic.com>		Andrew Vasquez <andrew.vasquez@qlogic.com>
	Andy Adamson <andros@citi.umich.edu>		Andy Adamson <andros@citi.umich.edu>
			Antoine Tenart <antoine.tenart@free-electrons.com>
	Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>		Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
	Archit Taneja <archit@ti.com>		Archit Taneja <archit@ti.com>
	Arnaud Patard <arnaud.patard@rtp-net.org>		Arnaud Patard <arnaud.patard@rtp-net.org>
	@@ -30,6 +31,9 @@ Axel Lin <axel.lin@gmail.com>
	Ben Gardner <bgardner@wabtec.com>		Ben Gardner <bgardner@wabtec.com>
	Ben M Cahill <ben.m.cahill@intel.com>		Ben M Cahill <ben.m.cahill@intel.com>
	Björn Steinbrink <B.Steinbrink@gmx.de>		Björn Steinbrink <B.Steinbrink@gmx.de>
			Boris Brezillon <boris.brezillon@free-electrons.com>
			Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
			Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
	Brian Avery <b.avery@hp.com>		Brian Avery <b.avery@hp.com>
	Brian King <brking@us.ibm.com>		Brian King <brking@us.ibm.com>
	Christoph Hellwig <hch@lst.de>		Christoph Hellwig <hch@lst.de>

MAINTAINERS

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2776,9 +2776,9 @@ F: include/net/caif/
	F: net/caif/		F: net/caif/

	CALGARY x86-64 IOMMU		CALGARY x86-64 IOMMU
	M: Muli Ben-Yehuda <muli@il.ibm.com>		M: Muli Ben-Yehuda <mulix@mulix.org>
	M: "Jon D. Mason" <jdmason@kudzu.us>		M: Jon Mason <jdmason@kudzu.us>
	L: discuss@x86-64.org		L: iommu@lists.linux-foundation.org
	S: Maintained		S: Maintained
	F: arch/x86/kernel/pci-calgary_64.c		F: arch/x86/kernel/pci-calgary_64.c
	F: arch/x86/kernel/tce_64.c		F: arch/x86/kernel/tce_64.c

arch/alpha/include/asm/pgalloc.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@ pgd_free(struct mm_struct mm, pgd_t pgd)
	static inline pmd_t *		static inline pmd_t *
	pmd_alloc_one(struct mm_struct *mm, unsigned long address)		pmd_alloc_one(struct mm_struct *mm, unsigned long address)
	{		{
	pmd_t ret = (pmd_t )__get_free_page(GFP_KERNEL\|__GFP_REPEAT\|__GFP_ZERO);		pmd_t ret = (pmd_t )__get_free_page(GFP_KERNEL\|__GFP_ZERO);
	return ret;		return ret;
	}		}

	@@ -53,7 +53,7 @@ pmd_free(struct mm_struct mm, pmd_t pmd)
	static inline pte_t *		static inline pte_t *
	pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)		pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
	{		{
	pte_t pte = (pte_t )__get_free_page(GFP_KERNEL\|__GFP_REPEAT\|__GFP_ZERO);		pte_t pte = (pte_t )__get_free_page(GFP_KERNEL\|__GFP_ZERO);
	return pte;		return pte;
	}		}

arch/arc/include/asm/pgalloc.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -95,7 +95,7 @@ static inline pte_t pte_alloc_one_kernel(struct mm_struct mm,
	{		{
	pte_t *pte;		pte_t *pte;

	pte = (pte_t *) __get_free_pages(GFP_KERNEL \| __GFP_REPEAT \| __GFP_ZERO,		pte = (pte_t *) __get_free_pages(GFP_KERNEL \| __GFP_ZERO,
	__get_order_pte());		__get_order_pte());

	return pte;		return pte;
	@@ -107,7 +107,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long address)
	pgtable_t pte_pg;		pgtable_t pte_pg;
	struct page *page;		struct page *page;

	pte_pg = (pgtable_t)__get_free_pages(GFP_KERNEL \| __GFP_REPEAT, __get_order_pte());		pte_pg = (pgtable_t)__get_free_pages(GFP_KERNEL, __get_order_pte());
	if (!pte_pg)		if (!pte_pg)
	return 0;		return 0;
	memzero((void )pte_pg, PTRS_PER_PTE sizeof(pte_t));		memzero((void )pte_pg, PTRS_PER_PTE sizeof(pte_t));

arch/arm/include/asm/pgalloc.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@

	static inline pmd_t pmd_alloc_one(struct mm_struct mm, unsigned long addr)		static inline pmd_t pmd_alloc_one(struct mm_struct mm, unsigned long addr)
	{		{
	return (pmd_t *)get_zeroed_page(GFP_KERNEL \| __GFP_REPEAT);		return (pmd_t *)get_zeroed_page(GFP_KERNEL);
	}		}

	static inline void pmd_free(struct mm_struct mm, pmd_t pmd)		static inline void pmd_free(struct mm_struct mm, pmd_t pmd)