diff mbox series

[v5,32/38] mm: Tidy up set_ptes definition

Message ID	20230710204339.3554919-33-willy@infradead.org (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Anshuman Khandual <anshuman.khandual@arm.com> Subject: [PATCH v5 32/38] mm: Tidy up set_ptes definition Date: Mon, 10 Jul 2023 21:43:33 +0100 Message-Id: <20230710204339.3554919-33-willy@infradead.org> In-Reply-To: <20230710204339.3554919-1-willy@infradead.org> References: <20230710204339.3554919-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	New page table range API \| expand [v5,00/38] New page table range API [v5,01/38] minmax: Add in_range() macro [v5,02/38] mm: Convert page_table_check_pte_set() to page_table_check_ptes_set() [v5,03/38] mm: Add generic flush_icache_pages() and documentation [v5,04/38] mm: Add folio_flush_mapping() [v5,05/38] mm: Remove ARCH_IMPLEMENTS_FLUSH_DCACHE_FOLIO [v5,06/38] mm: Add default definition of set_ptes() [v5,07/38] alpha: Implement the new page table range API [v5,08/38] arc: Implement the new page table range API [v5,09/38] arm: Implement the new page table range API [v5,10/38] arm64: Implement the new page table range API [v5,11/38] csky: Implement the new page table range API [v5,12/38] hexagon: Implement the new page table range API [v5,13/38] ia64: Implement the new page table range API [v5,14/38] loongarch: Implement the new page table range API [v5,15/38] m68k: Implement the new page table range API [v5,16/38] microblaze: Implement the new page table range API [v5,17/38] mips: Implement the new page table range API [v5,18/38] nios2: Implement the new page table range API [v5,19/38] openrisc: Implement the new page table range API [v5,20/38] parisc: Implement the new page table range API [v5,21/38] powerpc: Implement the new page table range API [v5,22/38] riscv: Implement the new page table range API [v5,23/38] s390: Implement the new page table range API [v5,24/38] sh: Implement the new page table range API [v5,25/38] sparc32: Implement the new page table range API [v5,26/38] sparc64: Implement the new page table range API [v5,27/38] um: Implement the new page table range API [v5,28/38] x86: Implement the new page table range API [v5,29/38] xtensa: Implement the new page table range API [v5,30/38] mm: Remove page_mapping_file() [v5,31/38] mm: Rationalise flush_icache_pages() and flush_icache_page() [v5,32/38] mm: Tidy up set_ptes definition [v5,33/38] mm: Use flush_icache_pages() in do_set_pmd() [v5,34/38] filemap: Add filemap_map_folio_range() [v5,35/38] rmap: add folio_add_file_rmap_range() [v5,36/38] mm: Convert do_set_pte() to set_pte_range() [v5,37/38] filemap: Batch PTE mappings [v5,38/38] mm: Call update_mmu_cache_range() in more page fault handling paths

Commit Message

Matthew Wilcox July 10, 2023, 8:43 p.m. UTC

Now that all architectures are converted, we can remove the
PFN_PTE_SHIFT ifdef and we can define set_pte_at() unconditionally.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
 include/linux/pgtable.h | 6 ------
 1 file changed, 6 deletions(-)

diff mbox series

Patch

diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
index 22f48f9997d5..e2a0bd5941be 100644
--- a/include/linux/pgtable.h
+++ b/include/linux/pgtable.h
@@ -181,7 +181,6 @@  static inline int pmd_young(pmd_t pmd)
 #endif
 
 #ifndef set_ptes
-#ifdef PFN_PTE_SHIFT
 /**
  * set_ptes - Map consecutive pages to a contiguous range of addresses.
  * @mm: Address space to map the pages into.
@@ -209,13 +208,8 @@  static inline void set_ptes(struct mm_struct *mm, unsigned long addr,
 		pte = __pte(pte_val(pte) + (1UL << PFN_PTE_SHIFT));
 	}
 }
-#ifndef set_pte_at
-#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1)
-#endif
 #endif
-#else
 #define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1)
-#endif
 
 #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
 extern int ptep_set_access_flags(struct vm_area_struct *vma,