Skip to content

Commit 6664876

Browse files
jassarssonsuryasaimadhu
authored andcommitted
mm: Remove MPX leftovers
Remove MPX leftovers in generic code. Fixes: 45fc24e ("x86/mpx: remove MPX from arch/x86") Signed-off-by: Jimmy Assarsson <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Acked-by: Dave Hansen <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 60abfd0 commit 6664876

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

fs/proc/task_mmu.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,6 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)
622622
[ilog2(VM_GROWSDOWN)] = "gd",
623623
[ilog2(VM_PFNMAP)] = "pf",
624624
[ilog2(VM_DENYWRITE)] = "dw",
625-
#ifdef CONFIG_X86_INTEL_MPX
626-
[ilog2(VM_MPX)] = "mp",
627-
#endif
628625
[ilog2(VM_LOCKED)] = "lo",
629626
[ilog2(VM_IO)] = "io",
630627
[ilog2(VM_SEQ_READ)] = "sr",

include/linux/mm.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,6 @@ extern unsigned int kobjsize(const void *objp);
329329
# define VM_MAPPED_COPY VM_ARCH_1 /* T if mapped copy of data (nommu mmap) */
330330
#endif
331331

332-
#if defined(CONFIG_X86_INTEL_MPX)
333-
/* MPX specific bounds table or bounds directory */
334-
# define VM_MPX VM_HIGH_ARCH_4
335-
#else
336-
# define VM_MPX VM_NONE
337-
#endif
338-
339332
#ifndef VM_GROWSUP
340333
# define VM_GROWSUP VM_NONE
341334
#endif

0 commit comments

Comments
 (0)