From: "tip-bot for Kirill A. Shutemov" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org,
kirill.shutemov@linux.intel.com, linux-kernel@vger.kernel.org,
luto@kernel.org
Subject: [tip:x86/urgent] x86/ldt: Remove unused variable in map_ldt_struct()
Date: Tue, 6 Nov 2018 12:40:59 -0800 [thread overview]
Message-ID: <tip-b082f2dd80612015cd6d9d84e52099734ec9a0e1@git.kernel.org> (raw)
In-Reply-To: <20181026122856.66224-4-kirill.shutemov@linux.intel.com>
Commit-ID: b082f2dd80612015cd6d9d84e52099734ec9a0e1
Gitweb: https://git.kernel.org/tip/b082f2dd80612015cd6d9d84e52099734ec9a0e1
Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
AuthorDate: Fri, 26 Oct 2018 15:28:56 +0300
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 6 Nov 2018 21:35:11 +0100
x86/ldt: Remove unused variable in map_ldt_struct()
Splitting out the sanity check in map_ldt_struct() moved page table syncing
into a separate function, which made the pgd variable unused. Remove it.
[ tglx: Massaged changelog ]
Fixes: 9bae3197e15d ("x86/ldt: Split out sanity check in map_ldt_struct()")
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Cc: bp@alien8.de
Cc: hpa@zytor.com
Cc: dave.hansen@linux.intel.com
Cc: peterz@infradead.org
Cc: boris.ostrovsky@oracle.com
Cc: jgross@suse.com
Cc: bhe@redhat.com
Cc: willy@infradead.org
Cc: linux-mm@kvack.org
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20181026122856.66224-4-kirill.shutemov@linux.intel.com
---
arch/x86/kernel/ldt.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
index 18e4525c5933..6135ae8ce036 100644
--- a/arch/x86/kernel/ldt.c
+++ b/arch/x86/kernel/ldt.c
@@ -207,7 +207,6 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot)
bool is_vmalloc;
spinlock_t *ptl;
int i, nr_pages;
- pgd_t *pgd;
if (!static_cpu_has(X86_FEATURE_PTI))
return 0;
@@ -221,13 +220,6 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot)
/* Check if the current mappings are sane */
sanity_check_ldt_mapping(mm);
- /*
- * Did we already have the top level entry allocated? We can't
- * use pgd_none() for this because it doens't do anything on
- * 4-level page table kernels.
- */
- pgd = pgd_offset(mm, LDT_BASE_ADDR);
-
is_vmalloc = is_vmalloc_addr(ldt->entries);
nr_pages = DIV_ROUND_UP(ldt->nr_entries * LDT_ENTRY_SIZE, PAGE_SIZE);
prev parent reply other threads:[~2018-11-06 20:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-26 12:28 [PATCHv3 0/3] Fix couple of issues with LDT remap for PTI Kirill A. Shutemov
2018-10-26 12:28 ` [PATCHv3 1/3] x86/mm: Move LDT remap out of KASLR region on 5-level paging Kirill A. Shutemov
2018-11-02 21:07 ` Andy Lutomirski
2018-11-06 20:39 ` [tip:x86/urgent] " tip-bot for Kirill A. Shutemov
2018-11-10 12:29 ` [PATCHv3 1/3] " Baoquan He
2018-11-23 15:58 ` Kirill A. Shutemov
2018-12-03 3:01 ` Baoquan He
2018-12-03 9:26 ` Kirill A. Shutemov
2018-10-26 12:28 ` [PATCHv3 2/3] x86/ldt: Unmap PTEs for the slot before freeing LDT pages Kirill A. Shutemov
2018-10-31 12:17 ` Kirill A. Shutemov
2018-11-06 20:40 ` [tip:x86/urgent] " tip-bot for Kirill A. Shutemov
2018-10-26 12:28 ` [PATCHv3 3/3] x86/ldt: Remove unused variable in map_ldt_struct() Kirill A. Shutemov
2018-11-02 21:08 ` Andy Lutomirski
2018-11-06 20:40 ` tip-bot for Kirill A. Shutemov [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=tip-b082f2dd80612015cd6d9d84e52099734ec9a0e1@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.