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

Commit 86fbf161 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (incoming from Andrew) 

Merge patches from Andrew Morton:
 "23 fixes and a MAINTAINERS update"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (24 commits)
  mm/hugetlb: check for pte NULL pointer in __page_check_address()
  fix build with make 3.80
  mm/mempolicy: fix !vma in new_vma_page()
  MAINTAINERS: add Davidlohr as GPT maintainer
  mm/memory-failure.c: recheck PageHuge() after hugetlb page migrate successfully
  mm/compaction: respect ignore_skip_hint in update_pageblock_skip
  mm/mempolicy: correct putback method for isolate pages if failed
  mm: add missing dependency in Kconfig
  sh: always link in helper functions extracted from libgcc
  mm: page_alloc: exclude unreclaimable allocations from zone fairness policy
  mm: numa: defer TLB flush for THP migration as long as possible
  mm: numa: guarantee that tlb_flush_pending updates are visible before page table updates
  mm: fix TLB flush race between migration, and change_protection_range
  mm: numa: avoid unnecessary disruption of NUMA hinting during migration
  mm: numa: clear numa hinting information on mprotect
  sched: numa: skip inaccessible VMAs
  mm: numa: avoid unnecessary work on the failure path
  mm: numa: ensure anon_vma is locked to prevent parallel THP splits
  mm: numa: do not clear PTE for pte_numa update
  mm: numa: do not clear PMD during PTE update scan
  ...
parents a36c160c 98398c32

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -3833,6 +3833,12 @@ T: git git://linuxtv.org/media_tree.git 
S:	Maintained

F:	drivers/media/usb/gspca/



GUID PARTITION TABLE (GPT)

M:	Davidlohr Bueso <davidlohr@hp.com>

L:	linux-efi@vger.kernel.org

S:	Maintained

F:	block/partitions/efi.*



STK1160 USB VIDEO CAPTURE DRIVER

M:	Ezequiel Garcia <elezegarcia@gmail.com>

L:	linux-media@vger.kernel.org

Makefile

+7 −13
Original line number Diff line number Diff line
@@ -732,19 +732,13 @@ export mod_strip_cmd 
# Select initial ramdisk compression format, default is gzip(1).

# This shall be used by the dracut(8) tool while creating an initramfs image.

#

INITRD_COMPRESS=gzip

ifeq ($(CONFIG_RD_BZIP2), y)

        INITRD_COMPRESS=bzip2

else ifeq ($(CONFIG_RD_LZMA), y)

        INITRD_COMPRESS=lzma

else ifeq ($(CONFIG_RD_XZ), y)

        INITRD_COMPRESS=xz

else ifeq ($(CONFIG_RD_LZO), y)

        INITRD_COMPRESS=lzo

else ifeq ($(CONFIG_RD_LZ4), y)

        INITRD_COMPRESS=lz4

endif

export INITRD_COMPRESS

INITRD_COMPRESS-y                  := gzip

INITRD_COMPRESS-$(CONFIG_RD_BZIP2) := bzip2

INITRD_COMPRESS-$(CONFIG_RD_LZMA)  := lzma

INITRD_COMPRESS-$(CONFIG_RD_XZ)    := xz

INITRD_COMPRESS-$(CONFIG_RD_LZO)   := lzo

INITRD_COMPRESS-$(CONFIG_RD_LZ4)   := lz4

export INITRD_COMPRESS := $(INITRD_COMPRESS-y)



ifdef CONFIG_MODULE_SIG_ALL

MODSECKEY = ./signing_key.priv

arch/sh/lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ lib-y = delay.o memmove.o memchr.o \ 
	 checksum.o strlen.o div64.o div64-generic.o



# Extracted from libgcc

lib-y += movmem.o ashldi3.o ashrdi3.o lshrdi3.o \

obj-y += movmem.o ashldi3.o ashrdi3.o lshrdi3.o \

	 ashlsi3.o ashrsi3.o ashiftrt.o lshrsi3.o \

	 udiv_qrnnd.o

arch/sparc/include/asm/pgtable_64.h

+2 −2
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static inline unsigned long pte_present(pte_t pte) 
}



#define pte_accessible pte_accessible

static inline unsigned long pte_accessible(pte_t a)

static inline unsigned long pte_accessible(struct mm_struct *mm, pte_t a)

{

	return pte_val(a) & _PAGE_VALID;

}
@@ -847,7 +847,7 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr, 
	 * SUN4V NOTE: _PAGE_VALID is the same value in both the SUN4U

	 *             and SUN4V pte layout, so this inline test is fine.

	 */

	if (likely(mm != &init_mm) && pte_accessible(orig))

	if (likely(mm != &init_mm) && pte_accessible(mm, orig))

		tlb_batch_add(mm, addr, ptep, orig, fullmm);

}

arch/x86/include/asm/pgtable.h

+9 −2
Original line number Diff line number Diff line
@@ -452,9 +452,16 @@ static inline int pte_present(pte_t a) 
}



#define pte_accessible pte_accessible

static inline int pte_accessible(pte_t a)

static inline bool pte_accessible(struct mm_struct *mm, pte_t a)

{

	return pte_flags(a) & _PAGE_PRESENT;

	if (pte_flags(a) & _PAGE_PRESENT)

		return true;



	if ((pte_flags(a) & (_PAGE_PROTNONE | _PAGE_NUMA)) &&

			mm_tlb_flush_pending(mm))

		return true;



	return false;

}



static inline int pte_hidden(pte_t pte)