diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-07-11 23:36:42 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-07-12 15:52:08 -0700 |
| commit | 998d4e2c33be49297c780e0e59a333918b7c97e4 (patch) | |
| tree | 502d14d829e47c1cb9d883baa57dcbebbbe176a0 /mm | |
| parent | 259043e3b730e0aa6408bff27af7edf7a5c9101c (diff) | |
| download | linux-998d4e2c33be49297c780e0e59a333918b7c97e4.tar.gz linux-998d4e2c33be49297c780e0e59a333918b7c97e4.tar.bz2 linux-998d4e2c33be49297c780e0e59a333918b7c97e4.zip | |
mm/hugetlb.c: undo errant change
During conflict resolution a line was unintentionally removed by a ksm.c
patch.
Link: https://lkml.kernel.org/r/85b0d694-d1ac-8e7a-2e50-1edc03eee21a@google.com
Fixes: ac90c56bbd73 ("mm/ksm: refactor out try_to_merge_with_zero_page()")
Reported-by: Hugh Dickins <hughd@google.com>
Cc: Aristeu Rozanski <aris@redhat.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/hugetlb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 0a69e194b517..f88ff0333945 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2631,6 +2631,7 @@ static int gather_surplus_pages(struct hstate *h, long delta) retry: spin_unlock_irq(&hugetlb_lock); for (i = 0; i < needed; i++) { + folio = NULL; for_each_node_mask(node, cpuset_current_mems_allowed) { if (!mbind_nodemask || node_isset(node, *mbind_nodemask)) { folio = alloc_surplus_hugetlb_folio(h, htlb_alloc_mask(h), |