diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-06-13 13:13:38 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-06-13 13:13:46 -0700 |
| commit | 4c7d3d79c736186bb2585f2d0a8231e1fac839da (patch) | |
| tree | 5abd973d57d360e24c9df2f17e942176ab2faaa5 /mm/filemap.c | |
| parent | 3ec8d7572a69d142d49f52b28ce8d84e5fef9131 (diff) | |
| parent | d20f6b3d747c36889b7ce75ee369182af3decb6b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts, no adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 382c3d06bfb1..876cc64aadd7 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1000,7 +1000,7 @@ struct folio *filemap_alloc_folio_noprof(gfp_t gfp, unsigned int order) do { cpuset_mems_cookie = read_mems_allowed_begin(); n = cpuset_mem_spread_node(); - folio = __folio_alloc_node(gfp, order, n); + folio = __folio_alloc_node_noprof(gfp, order, n); } while (!folio && read_mems_allowed_retry(cpuset_mems_cookie)); return folio; |