Commit 79941493 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'folio-5.16b' of git://git.infradead.org/users/willy/pagecache 

Pull folio fixes from Matthew Wilcox:
 "In the course of preparing the folio changes for iomap for next merge
  window, we discovered some problems that would be nice to address now:

   - Renaming multi-page folios to large folios.

     mapping_multi_page_folio_support() is just a little too long, so we
     settled on mapping_large_folio_support(). That meant renaming, eg
     folio_test_multi() to folio_test_large().

     Rename AS_THP_SUPPORT to match

   - I hadn't included folio wrappers for zero_user_segments(), etc.
     Also, multi-page^W^W large folio support is now independent of
     CONFIG_TRANSPARENT_HUGEPAGE, so machines with HIGHMEM always need
     to fall back to the out-of-line zero_user_segments().

     Remove FS_THP_SUPPORT to match

   - The build bots finally got round to telling me that I missed a
     couple of architectures when adding flush_dcache_folio(). Christoph
     suggested that we just add linux/cacheflush.h and not rely on
     asm-generic/cacheflush.h"

* tag 'folio-5.16b' of git://git.infradead.org/users/willy/pagecache:
  mm: Add functions to zero portions of a folio
  fs: Rename AS_THP_SUPPORT and mapping_thp_support
  fs: Remove FS_THP_SUPPORT
  mm: Remove folio_test_single
  mm: Rename folio_test_multi to folio_test_large
  Add linux/cacheflush.h
parents 5f53fa50 c0357139

arch/arc/include/asm/cacheflush.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ void __flush_dcache_page(phys_addr_t paddr, unsigned long vaddr); 
#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1



void flush_dcache_page(struct page *page);

void flush_dcache_folio(struct folio *folio);



void dma_cache_wback_inv(phys_addr_t start, unsigned long sz);

void dma_cache_inv(phys_addr_t start, unsigned long sz);

arch/arm/include/asm/cacheflush.h

+0 −1
Original line number Diff line number Diff line
@@ -290,7 +290,6 @@ extern void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr 
 */

#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1

extern void flush_dcache_page(struct page *);

void flush_dcache_folio(struct folio *folio);



#define ARCH_IMPLEMENTS_FLUSH_KERNEL_VMAP_RANGE 1

static inline void flush_kernel_vmap_range(void *addr, int size)

arch/m68k/include/asm/cacheflush_mm.h

+0 −1
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ static inline void __flush_page_to_ram(void *vaddr) 


#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1

#define flush_dcache_page(page)		__flush_page_to_ram(page_address(page))

void flush_dcache_folio(struct folio *folio);

#define flush_dcache_mmap_lock(mapping)		do { } while (0)

#define flush_dcache_mmap_unlock(mapping)	do { } while (0)

#define flush_icache_page(vma, page)	__flush_page_to_ram(page_address(page))

arch/mips/include/asm/cacheflush.h

+0 −2
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ static inline void flush_dcache_page(struct page *page) 
		SetPageDcacheDirty(page);

}



void flush_dcache_folio(struct folio *folio);



#define flush_dcache_mmap_lock(mapping)		do { } while (0)

#define flush_dcache_mmap_unlock(mapping)	do { } while (0)

arch/nds32/include/asm/cacheflush.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ void flush_cache_vunmap(unsigned long start, unsigned long end); 


#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1

void flush_dcache_page(struct page *page);

void flush_dcache_folio(struct folio *folio);

void copy_to_user_page(struct vm_area_struct *vma, struct page *page,

		       unsigned long vaddr, void *dst, void *src, int len);

void copy_from_user_page(struct vm_area_struct *vma, struct page *page,