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

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

diff --cc arch/powerpc/include/asm/mmu_context.h
index 611204e,4a6dd3b..58efca9
--- 1/arch/powerpc/include/asm/mmu_context.h
--- 2/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)

diff --cc arch/x86/mm/mpx.c
Simple merge