2020-04-02 18:15:36

by Jimmy Assarsson

[permalink] [raw]
Subject: [PATCH] x86/mpx: remove MPX leftovers

Remove leftovers from x86/mpx.

Fixes: 45fc24e89b7c ("x86/mpx: remove MPX from arch/x86")
Cc: Dave Hansen <[email protected]>
Cc: [email protected]
Signed-off-by: Jimmy Assarsson <[email protected]>
---
fs/proc/task_mmu.c | 3 ---
include/linux/mm.h | 7 -------
2 files changed, 10 deletions(-)

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 3ba9ae83bff5..53dce43fdd9a 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -652,9 +652,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",
diff --git a/include/linux/mm.h b/include/linux/mm.h
index c54fb96cb1e6..70717ae2be7f 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -328,13 +328,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
--
2.26.0


2020-04-22 18:58:36

by Dave Hansen

[permalink] [raw]
Subject: Re: [PATCH] x86/mpx: remove MPX leftovers

On 4/2/20 10:25 AM, Jimmy Assarsson wrote:
> Remove leftovers from x86/mpx.

Thanks for finding these!


2020-04-22 18:59:31

by Dave Hansen

[permalink] [raw]
Subject: Re: [PATCH] x86/mpx: remove MPX leftovers

Bah, fat fingers. Forgot:

Acked-by: Dave Hansen <[email protected]>

Subject: [tip: x86/cleanups] mm: Remove MPX leftovers

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID: 66648766ef38d8d6c48ded2f59cf98420aec2cdb
Gitweb: https://git.kernel.org/tip/66648766ef38d8d6c48ded2f59cf98420aec2cdb
Author: Jimmy Assarsson <[email protected]>
AuthorDate: Thu, 02 Apr 2020 19:25:07 +02:00
Committer: Borislav Petkov <[email protected]>
CommitterDate: Wed, 22 Apr 2020 21:02:35 +02:00

mm: Remove MPX leftovers

Remove MPX leftovers in generic code.

Fixes: 45fc24e89b7c ("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]
---
fs/proc/task_mmu.c | 3 ---
include/linux/mm.h | 7 -------
2 files changed, 10 deletions(-)

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 8d382d4..e12ad2e 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -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",
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 5a32342..e1882ee 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -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