From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 May 2019 17:23:24 +0000 (-0700)
Subject: Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.4.17~3510
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1335d9a1fb2abbe5022de3c517989cc7c7161dee;p=arm%2Flinux.git

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull core fixes from Ingo Molnar:
 "This fixes a particularly thorny munmap() bug with MPX, plus fixes a
  host build environment assumption in objtool"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Allow AR to be overridden with HOSTAR
  x86/mpx, mm/core: Fix recursive munmap() corruption
---

1335d9a1fb2abbe5022de3c517989cc7c7161dee
diff --cc arch/powerpc/include/asm/mmu_context.h
index 611204e588b9,4a6dd3ba0b0b..58efca934311
--- a/arch/powerpc/include/asm/mmu_context.h
+++ b/arch/powerpc/include/asm/mmu_context.h
@@@ -229,10 -228,15 +229,9 @@@ static inline void enter_lazy_tlb(struc
  #endif
  }
  
 -#ifdef CONFIG_PPC_BOOK3E_64
 -static inline void arch_exit_mmap(struct mm_struct *mm)
 -{
 -}
 -#else
  extern void arch_exit_mmap(struct mm_struct *mm);
 -#endif
  
  static inline void arch_unmap(struct mm_struct *mm,
- 			      struct vm_area_struct *vma,
  			      unsigned long start, unsigned long end)
  {
  	if (start <= mm->context.vdso_base && mm->context.vdso_base < end)