diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-07-06 20:44:41 +0200 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-07-06 20:44:41 +0200 |
| commit | 8ef6fd0e9ea83a792ba53882ddc6e0d38ce0d636 (patch) | |
| tree | b119eaeb76c7afb8672d30078ab7061cb7be67fb /mm/internal.h | |
| parent | docs: mm: add enable_soft_offline sysctl (diff) | |
| parent | MAINTAINERS: mailmap: update Lorenzo Stoakes's email address (diff) | |
| download | linux-8ef6fd0e9ea83a792ba53882ddc6e0d38ce0d636.tar.xz linux-8ef6fd0e9ea83a792ba53882ddc6e0d38ce0d636.zip | |
Merge branch 'mm-hotfixes-stable' into mm-stable to pick up "mm: fix
crashes from deferred split racing folio migration", needed by "mm:
migrate: split folio_migrate_mapping()".
Diffstat (limited to 'mm/internal.h')
| -rw-r--r-- | mm/internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/internal.h b/mm/internal.h index 2ea9a88dcb95..b4d86436565b 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1226,8 +1226,8 @@ int migrate_device_coherent_page(struct page *page); /* * mm/gup.c */ -struct folio *try_grab_folio(struct page *page, int refs, unsigned int flags); -int __must_check try_grab_page(struct page *page, unsigned int flags); +int __must_check try_grab_folio(struct folio *folio, int refs, + unsigned int flags); /* * mm/huge_memory.c |