The patch titled
Subject: mm-initialize-pages-on-demand-during-boot-v5-fix
has been removed from the -mm tree. Its filename was
mm-initialize-pages-on-demand-during-boot-v5-fix.patch
This patch was dropped because it was folded into mm-initialize-pages-on-demand-during-boot.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-initialize-pages-on-demand-during-boot-v5-fix
tweak comments
Cc: Daniel Jordan <daniel.m.jordan@xxxxxxxxxx>
Cc: Masayoshi Mizuma <m.mizuma@xxxxxxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxx>
Cc: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx>
Cc: Steven Sistare <steven.sistare@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff -puN mm/page_alloc.c~mm-initialize-pages-on-demand-during-boot-v5-fix mm/page_alloc.c
--- a/mm/page_alloc.c~mm-initialize-pages-on-demand-during-boot-v5-fix
+++ a/mm/page_alloc.c
@@ -1577,7 +1577,7 @@ static int __init deferred_init_memmap(v
/*
* During boot we initialize deferred pages on-demand, as needed, but once
* page_alloc_init_late() has finished, the deferred pages are all initialized,
- * and we can permanently disable path.
+ * and we can permanently disable that path.
*/
static DEFINE_STATIC_KEY_TRUE(deferred_pages);
@@ -1589,8 +1589,8 @@ static DEFINE_STATIC_KEY_TRUE(deferred_p
* PAGES_PER_SECTION * sizeof(struct page) bytes.
*
* Return true when zone was grown, otherwise return false. We return true even
- * when we grow less than requested, let the caller decide if there are enough
- * pages to satisfy allocation.
+ * when we grow less than requested, to let the caller decide if there are
+ * enough pages to satisfy the allocation.
*
* Note: We use noinline because this function is needed only during boot, and
* it is called from a __ref function _deferred_grow_zone. This way we are
@@ -1617,9 +1617,9 @@ deferred_grow_zone(struct zone *zone, un
/*
* If deferred pages have been initialized while we were waiting for
- * lock return true, as zone was grown. The caller will try again this
- * zone. We won't return to this function again, since caller also has
- * this static branch.
+ * the lock, return true, as the zone was grown. The caller will retry
+ * this zone. We won't return to this function since the caller also
+ * has this static branch.
*/
if (!static_branch_unlikely(&deferred_pages)) {
pgdat_resize_unlock_irq(pgdat, &flags);
@@ -1703,8 +1703,8 @@ void __init page_alloc_init_late(void)
wait_for_completion(&pgdat_init_all_done_comp);
/*
- * We initialized the rest of deferred pages, permanently
- * disable on-demand struct page initialization.
+ * We initialized the rest of the deferred pages. Permanently disable
+ * on-demand struct page initialization.
*/
static_branch_disable(&deferred_pages);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-initialize-pages-on-demand-during-boot.patch
mm-initialize-pages-on-demand-during-boot-v6-checkpatch-fixes.patch
direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch
mm-fix-races-between-swapoff-and-flush-dcache-fix.patch
headers-untangle-kmemleakh-from-mmh-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
