summaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2018-08-31 08:46:08 -0400
committerIngo Molnar <mingo@kernel.org>2019-04-03 04:32:40 -0400
commited6a79352cad00e9a49d6e438be40e45107207bf (patch)
treea1ed733ba7eacb57d93e6bb825a24b63769a11c9 /mm/memory.c
parentdea2434c23c102b3e7d320849ec1cfeb432edb60 (diff)
asm-generic/tlb, arch: Provide CONFIG_HAVE_MMU_GATHER_PAGE_SIZE
Move the mmu_gather::page_size things into the generic code instead of PowerPC specific bits. No change in behavior intended. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Will Deacon <will.deacon@arm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andy Lutomirski <luto@kernel.org> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Nick Piggin <npiggin@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@surriel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r--mm/memory.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c
index ab650c21bccd..1aa5c03566f1 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -356,7 +356,7 @@ void free_pgd_range(struct mmu_gather *tlb,
356 * We add page table cache pages with PAGE_SIZE, 356 * We add page table cache pages with PAGE_SIZE,
357 * (see pte_free_tlb()), flush the tlb if we need 357 * (see pte_free_tlb()), flush the tlb if we need
358 */ 358 */
359 tlb_remove_check_page_size_change(tlb, PAGE_SIZE); 359 tlb_change_page_size(tlb, PAGE_SIZE);
360 pgd = pgd_offset(tlb->mm, addr); 360 pgd = pgd_offset(tlb->mm, addr);
361 do { 361 do {
362 next = pgd_addr_end(addr, end); 362 next = pgd_addr_end(addr, end);
@@ -1046,7 +1046,7 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb,
1046 pte_t *pte; 1046 pte_t *pte;
1047 swp_entry_t entry; 1047 swp_entry_t entry;
1048 1048
1049 tlb_remove_check_page_size_change(tlb, PAGE_SIZE); 1049 tlb_change_page_size(tlb, PAGE_SIZE);
1050again: 1050again:
1051 init_rss_vec(rss); 1051 init_rss_vec(rss);
1052 start_pte = pte_offset_map_lock(mm, pmd, addr, &ptl); 1052 start_pte = pte_offset_map_lock(mm, pmd, addr, &ptl);