Commit 998d4e2c authored by Andrew Morton's avatar Andrew Morton

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: ac90c56b ("mm/ksm: refactor out try_to_merge_with_zero_page()")
Reported-by: default avatarHugh Dickins <hughd@google.com>
Cc: Aristeu Rozanski <aris@redhat.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 259043e3
...@@ -2631,6 +2631,7 @@ static int gather_surplus_pages(struct hstate *h, long delta) ...@@ -2631,6 +2631,7 @@ static int gather_surplus_pages(struct hstate *h, long delta)
retry: retry:
spin_unlock_irq(&hugetlb_lock); spin_unlock_irq(&hugetlb_lock);
for (i = 0; i < needed; i++) { for (i = 0; i < needed; i++) {
folio = NULL;
for_each_node_mask(node, cpuset_current_mems_allowed) { for_each_node_mask(node, cpuset_current_mems_allowed) {
if (!mbind_nodemask || node_isset(node, *mbind_nodemask)) { if (!mbind_nodemask || node_isset(node, *mbind_nodemask)) {
folio = alloc_surplus_hugetlb_folio(h, htlb_alloc_mask(h), folio = alloc_surplus_hugetlb_folio(h, htlb_alloc_mask(h),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment