[tip:x86/urgent] x86/ldt: Remove unused variable in map_ldt_struct()
Commit-ID: b082f2dd80612015cd6d9d84e52099734ec9a0e1 Gitweb: https://git.kernel.org/tip/b082f2dd80612015cd6d9d84e52099734ec9a0e1 Author: Kirill A. Shutemov AuthorDate: Fri, 26 Oct 2018 15:28:56 +0300 Committer: Thomas Gleixner 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 Signed-off-by: Thomas Gleixner Reviewed-by: Andy Lutomirski Cc: b...@alien8.de Cc: h...@zytor.com Cc: dave.han...@linux.intel.com Cc: pet...@infradead.org Cc: boris.ostrov...@oracle.com Cc: jgr...@suse.com Cc: b...@redhat.com Cc: wi...@infradead.org Cc: linux...@kvack.org Cc: sta...@vger.kernel.org Link: https://lkml.kernel.org/r/20181026122856.66224-4-kirill.shute...@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);
[tip:x86/urgent] x86/ldt: Remove unused variable in map_ldt_struct()
Commit-ID: b082f2dd80612015cd6d9d84e52099734ec9a0e1 Gitweb: https://git.kernel.org/tip/b082f2dd80612015cd6d9d84e52099734ec9a0e1 Author: Kirill A. Shutemov AuthorDate: Fri, 26 Oct 2018 15:28:56 +0300 Committer: Thomas Gleixner 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 Signed-off-by: Thomas Gleixner Reviewed-by: Andy Lutomirski Cc: b...@alien8.de Cc: h...@zytor.com Cc: dave.han...@linux.intel.com Cc: pet...@infradead.org Cc: boris.ostrov...@oracle.com Cc: jgr...@suse.com Cc: b...@redhat.com Cc: wi...@infradead.org Cc: linux...@kvack.org Cc: sta...@vger.kernel.org Link: https://lkml.kernel.org/r/20181026122856.66224-4-kirill.shute...@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);