UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/mm: Drop unused argument 'removed' from sync_global_pgds() 

Since commit af2cf278ef ("x86/mm/hotplug: Don't remove PGD entries in
remove_pagetable()") there are no callers of sync_global_pgds() which set
the 'removed' argument to 1.

Remove the argument and the related conditionals in the function.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Link: http://lkml.kernel.org/r/20161214234403.137556-1-kirill.shutemov@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Kirill A. Shutemov 2016-12-15 02:44:03 +03:00 committed by Thomas Gleixner
parent aec03f89e9
commit 5372e155a2
3 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/include/asm/pgtable_64.h
View File

@ -116,8 +116,7 @@ static inline void native_pgd_clear(pgd_t *pgd)
native_set_pgd(pgd, native_make_pgd(0)); native_set_pgd(pgd, native_make_pgd(0));
} }
extern void sync_global_pgds(unsigned long start, unsigned long end, extern void sync_global_pgds(unsigned long start, unsigned long end);
int removed);
/* /*
* Conversion functions: convert a page and protection to a page entry, * Conversion functions: convert a page and protection to a page entry,

2
arch/x86/mm/fault.c
View File

@ -413,7 +413,7 @@ out:
void vmalloc_sync_all(void) void vmalloc_sync_all(void)
{ {
sync_global_pgds(VMALLOC_START & PGDIR_MASK, VMALLOC_END, 0); sync_global_pgds(VMALLOC_START & PGDIR_MASK, VMALLOC_END);
} }
/* /*

20
arch/x86/mm/init_64.c
View File

@ -89,10 +89,10 @@ static int __init nonx32_setup(char *str)
__setup("noexec32=", nonx32_setup); __setup("noexec32=", nonx32_setup);
/* /*
* When memory was added/removed make sure all the processes MM have * When memory was added make sure all the processes MM have
* suitable PGD entries in the local PGD level page. * suitable PGD entries in the local PGD level page.
*/ */
void sync_global_pgds(unsigned long start, unsigned long end, int removed) void sync_global_pgds(unsigned long start, unsigned long end)
{ {
unsigned long address; unsigned long address;
@ -100,12 +100,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
const pgd_t *pgd_ref = pgd_offset_k(address); const pgd_t *pgd_ref = pgd_offset_k(address);
struct page *page; struct page *page;
/* if (pgd_none(*pgd_ref))
* When it is called after memory hot remove, pgd_none()
* returns true. In this case (removed == 1), we must clear
* the PGD entries in the local PGD level page.
*/
if (pgd_none(*pgd_ref) && !removed)
continue; continue;
spin_lock(&pgd_lock); spin_lock(&pgd_lock);
@ -122,13 +117,8 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
BUG_ON(pgd_page_vaddr(*pgd) BUG_ON(pgd_page_vaddr(*pgd)
!= pgd_page_vaddr(*pgd_ref)); != pgd_page_vaddr(*pgd_ref));
if (removed) {
if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
pgd_clear(pgd);
} else {
if (pgd_none(*pgd)) if (pgd_none(*pgd))
set_pgd(pgd, *pgd_ref); set_pgd(pgd, *pgd_ref);
}
spin_unlock(pgt_lock); spin_unlock(pgt_lock);
} }
@ -596,7 +586,7 @@ kernel_physical_mapping_init(unsigned long paddr_start,
} }
if (pgd_changed) if (pgd_changed)
sync_global_pgds(vaddr_start, vaddr_end - 1, 0); sync_global_pgds(vaddr_start, vaddr_end - 1);
__flush_tlb_all(); __flush_tlb_all();
@ -1239,7 +1229,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
} else } else
err = vmemmap_populate_basepages(start, end, node); err = vmemmap_populate_basepages(start, end, node);
if (!err) if (!err)
sync_global_pgds(start, end - 1, 0); sync_global_pgds(start, end - 1);
return err; return err;
} }