From: "tip-bot2 for Jimmy Assarsson" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Jimmy Assarsson <jimmyassarsson@gmail.com>,
Borislav Petkov <bp@suse.de>,
Dave Hansen <dave.hansen@linux.intel.com>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/cleanups] mm: Remove MPX leftovers
Date: Wed, 22 Apr 2020 19:13:27 -0000 [thread overview]
Message-ID: <158758280709.28353.11814672256767435249.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200402172507.2786-1-jimmyassarsson@gmail.com>
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 <jimmyassarsson@gmail.com>
AuthorDate: Thu, 02 Apr 2020 19:25:07 +02:00
Committer: Borislav Petkov <bp@suse.de>
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 <jimmyassarsson@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/20200402172507.2786-1-jimmyassarsson@gmail.com
---
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
prev parent reply other threads:[~2020-04-22 19:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-02 17:25 [PATCH] x86/mpx: remove MPX leftovers Jimmy Assarsson
2020-04-22 18:56 ` Dave Hansen
2020-04-22 18:56 ` Dave Hansen
2020-04-22 19:13 ` tip-bot2 for Jimmy Assarsson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=158758280709.28353.11814672256767435249.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=dave.hansen@linux.intel.com \
--cc=jimmyassarsson@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).