The patch titled
Subject: mm-initialize-pages-on-demand-during-boot-v5-fix
has been added to the -mm tree. Its filename is
mm-initialize-pages-on-demand-during-boot-v5-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-initialize-pages-on-demand-during-boot-v5-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-initialize-pages-on-demand-during-boot-v5-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
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
@@ -1574,7 +1574,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);
@@ -1586,8 +1586,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
@@ -1614,9 +1614,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);
@@ -1700,8 +1700,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-memblock-hardcode-the-end_pfn-being-1-fix.patch
mm-memblock-hardcode-the-end_pfn-being-1-fix-fix.patch
mm-mempolicy-avoid-use-uninitialized-preferred_node-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
mm-initialize-pages-on-demand-during-boot-fix-4-fix.patch
mm-initialize-pages-on-demand-during-boot-v5-fix.patch
mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch
direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch
mm-fix-races-between-swapoff-and-flush-dcache-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch
linux-next-rejects.patch
linux-next-fixup.patch
fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch
headers-untangle-kmemleakh-from-mmh-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.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
