Message ID | 20250217190836.435039-7-willy@infradead.org (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | Add folio_mk_pte() and simplify mk_pte() | expand |
On 17.02.25 20:08, Matthew Wilcox (Oracle) wrote: > All architectures now use the common mk_pte() definition, so we > can remove the condition. > > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> > --- > include/linux/mm.h | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 3ef11ff3922f..62dccde9c561 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -1916,14 +1916,12 @@ static inline struct folio *pfn_folio(unsigned long pfn) > return page_folio(pfn_to_page(pfn)); > } > > -#ifndef mk_pte > #ifdef CONFIG_MMU > static inline pte_t mk_pte(struct page *page, pgprot_t pgprot) > { > return pfn_pte(page_to_pfn(page), pgprot); > } > #endif > -#endif > > /** > * folio_maybe_dma_pinned - Report if a folio may be pinned for DMA. Acked-by: David Hildenbrand <david@redhat.com>
diff --git a/include/linux/mm.h b/include/linux/mm.h index 3ef11ff3922f..62dccde9c561 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1916,14 +1916,12 @@ static inline struct folio *pfn_folio(unsigned long pfn) return page_folio(pfn_to_page(pfn)); } -#ifndef mk_pte #ifdef CONFIG_MMU static inline pte_t mk_pte(struct page *page, pgprot_t pgprot) { return pfn_pte(page_to_pfn(page), pgprot); } #endif -#endif /** * folio_maybe_dma_pinned - Report if a folio may be pinned for DMA.
All architectures now use the common mk_pte() definition, so we can remove the condition. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- include/linux/mm.h | 2 -- 1 file changed, 2 deletions(-)