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/mempool.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/mempool.c')
| -rw-r--r-- | mm/mempool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempool.c b/mm/mempool.c index 6ece63a00acf..3223337135d0 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -273,7 +273,7 @@ mempool_t *mempool_create_node_noprof(int min_nr, mempool_alloc_t *alloc_fn, { mempool_t *pool; - pool = kzalloc_node(sizeof(*pool), gfp_mask, node_id); + pool = kmalloc_node_noprof(sizeof(*pool), gfp_mask | __GFP_ZERO, node_id); if (!pool) return NULL; |