Commit 66648766 authored by Jimmy Assarsson's avatar Jimmy Assarsson Committed by Borislav Petkov
Browse files

mm: Remove MPX leftovers 



Remove MPX leftovers in generic code.

Fixes: 45fc24e8 ("x86/mpx: remove MPX from arch/x86")
Signed-off-by: default avatarJimmy Assarsson <jimmyassarsson@gmail.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/20200402172507.2786-1-jimmyassarsson@gmail.com
parent 60abfd08

fs/proc/task_mmu.c

+0 −3
Original line number Diff line number Diff line
@@ -622,9 +622,6 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) 
		[ilog2(VM_GROWSDOWN)]	= "gd",

		[ilog2(VM_PFNMAP)]	= "pf",

		[ilog2(VM_DENYWRITE)]	= "dw",

#ifdef CONFIG_X86_INTEL_MPX

		[ilog2(VM_MPX)]		= "mp",

#endif

		[ilog2(VM_LOCKED)]	= "lo",

		[ilog2(VM_IO)]		= "io",

		[ilog2(VM_SEQ_READ)]	= "sr",

include/linux/mm.h

+0 −7
Original line number Diff line number Diff line
@@ -329,13 +329,6 @@ extern unsigned int kobjsize(const void *objp); 
# define VM_MAPPED_COPY	VM_ARCH_1	/* T if mapped copy of data (nommu mmap) */

#endif



#if defined(CONFIG_X86_INTEL_MPX)

/* MPX specific bounds table or bounds directory */

# define VM_MPX		VM_HIGH_ARCH_4

#else

# define VM_MPX		VM_NONE

#endif



#ifndef VM_GROWSUP

# define VM_GROWSUP	VM_NONE

#endif