From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,willy@infradead.org,vishal.moola@gmail.com,sidhartha.kumar@oracle.com,osalvador@suse.de,muchun.song@linux.dev,fan.ni@samsung.com,david@redhat.com,akpm@linux-foundation.org,akpm@linux-foundation.org
Subject: [folded-merged] mm-hugetlbc-__unmap_hugepage_range-comment-cleanup.patch removed from -mm tree
Date: Mon, 12 May 2025 23:42:43 -0700 [thread overview]
Message-ID: <20250513064243.81670C4CEE4@smtp.kernel.org> (raw)
The quilt patch titled
Subject: mm/hugetlb.c: __unmap_hugepage_range(): comment cleanup
has been removed from the -mm tree. Its filename was
mm-hugetlbc-__unmap_hugepage_range-comment-cleanup.patch
This patch was dropped because it was folded into mm-kmemleak-mark-variables-as-__read_mostly.patch
------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm/hugetlb.c: __unmap_hugepage_range(): comment cleanup
Date: Mon May 5 02:54:25 PM PDT 2025
Wrap to 80 cols, fix a typo, use regular layout, parenthesize function
identifiers, fix grammar and add braces.
Cc: David Hildenbrand <david@redhat.com>
Cc: Fan Ni <fan.ni@samsung.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: "Vishal Moola (Oracle)" <vishal.moola@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/hugetlb.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
--- a/mm/hugetlb.c~mm-hugetlbc-__unmap_hugepage_range-comment-cleanup
+++ a/mm/hugetlb.c
@@ -5969,16 +5969,19 @@ void __unmap_hugepage_range(struct mmu_g
if (adjust_reservation) {
int rc = vma_needs_reservation(h, vma, address);
- if (rc < 0)
- /* Pressumably allocate_file_region_entries failed
- * to allocate a file_region struct. Clear
- * hugetlb_restore_reserve so that global reserve
- * count will not be incremented by free_huge_folio.
- * Act as if we consumed the reservation.
+ if (rc < 0) {
+ /*
+ * Presumably allocate_file_region_entries()
+ * failed to allocate a file_region struct.
+ * Clear hugetlb_restore_reserve so that the
+ * global reserve count will not be incremented
+ * by free_huge_folio(). Act as if we consumed
+ * the reservation.
*/
folio_clear_hugetlb_restore_reserve(folio);
- else if (rc)
+ } else if (rc) {
vma_add_reservation(h, vma, address);
+ }
}
tlb_remove_page_size(tlb, folio_page(folio, 0),
_
Patches currently in -mm which might be from akpm@linux-foundation.org are
mm-establish-mm-vma_execc-for-shared-exec-mm-vma-functionality-fix.patch
mm-perform-vma-allocation-freeing-duplication-in-mm-fix.patch
filemap-do-not-use-folio_contains-for-swap-cache-folios-fix.patch
memcontrol-add-ksm_profit-in-cgroup-memoryksm_stat-fix.patch
mm-add-zblock-allocator-fix.patch
mm-add-zblock-allocator-fix-2.patch
mm-add-zblock-allocator-fix-3.patch
mm-zblock-avoid-failing-the-build-fix.patch
revert-x86-mm-remove-unused-__set_memory_prot-fix.patch
reply other threads:[~2025-05-13 6:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250513064243.81670C4CEE4@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=fan.ni@samsung.com \
--cc=mm-commits@vger.kernel.org \
--cc=muchun.song@linux.dev \
--cc=osalvador@suse.de \
--cc=sidhartha.kumar@oracle.com \
--cc=vishal.moola@gmail.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.