diff options
| author | Linus Torvalds | 2019-05-19 10:23:24 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-05-19 10:23:24 -0700 |
| commit | 1335d9a1fb2abbe5022de3c517989cc7c7161dee (patch) | |
| tree | 23e4a27cb22bb09fefea09a62e419a8c5bcc32cd /arch/um | |
| parent | 4c4a5c99af7f479a14759196f8df9467128f3baf (diff) | |
| parent | 8ea58f1e8b11cca3087b294779bf5959bf89cc10 (diff) | |
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
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/asm/mmu_context.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/asm/mmu_context.h index fca34b2177e2..9f4b4bb78120 100644 --- a/arch/um/include/asm/mmu_context.h +++ b/arch/um/include/asm/mmu_context.h @@ -22,7 +22,6 @@ static inline int arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm) } extern void arch_exit_mmap(struct mm_struct *mm); static inline void arch_unmap(struct mm_struct *mm, - struct vm_area_struct *vma, unsigned long start, unsigned long end) { } |