The patch titled
Subject: mm: fix some comments in page_alloc.c and mempolicy.c
has been removed from the -mm tree. Its filename was
mm-fix-some-comments-in-page_allocc-and-mempolicyc.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Hui Su <sh_def@xxxxxxx>
Subject: mm: fix some comments in page_alloc.c and mempolicy.c
1. The cpuset.c has been moved from kernel/cpuset.c to
kernel/cgroup/cpuset.c long time ago, but the comment is stale, so we
update it.
2. get_page_from_freelist() may alloc many pages according to order,
we may use pages for better.
Link: https://lkml.kernel.org/r/20200925160650.GA42847@rlk
Signed-off-by: Hui Su <sh_def@xxxxxxx>
Cc: Zefan Li <lizefan@xxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/cgroup/cpuset.c | 2 +-
mm/mempolicy.c | 2 +-
mm/page_alloc.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
--- a/kernel/cgroup/cpuset.c~mm-fix-some-comments-in-page_allocc-and-mempolicyc
+++ a/kernel/cgroup/cpuset.c
@@ -1,5 +1,5 @@
/*
- * kernel/cpuset.c
+ * kernel/cgroup/cpuset.c
*
* Processor and Memory placement constraints for sets of tasks.
*
--- a/mm/mempolicy.c~mm-fix-some-comments-in-page_allocc-and-mempolicyc
+++ a/mm/mempolicy.c
@@ -2291,7 +2291,7 @@ int vma_dup_policy(struct vm_area_struct
* rebinds the mempolicy its copying by calling mpol_rebind_policy()
* with the mems_allowed returned by cpuset_mems_allowed(). This
* keeps mempolicies cpuset relative after its cpuset moves. See
- * further kernel/cpuset.c update_nodemask().
+ * further kernel/cgroup/cpuset.c update_nodemask().
*
* current's mempolicy may be rebinded by the other task(the task that changes
* cpuset's mems), so we needn't do rebind work for current task.
--- a/mm/page_alloc.c~mm-fix-some-comments-in-page_allocc-and-mempolicyc
+++ a/mm/page_alloc.c
@@ -3734,7 +3734,7 @@ static inline unsigned int current_alloc
/*
* get_page_from_freelist goes through the zonelist trying to allocate
- * a page.
+ * pages.
*/
static struct page *
get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
@@ -3748,7 +3748,7 @@ get_page_from_freelist(gfp_t gfp_mask, u
retry:
/*
* Scan zonelist, looking for a zone with enough free.
- * See also __cpuset_node_allowed() comment in kernel/cpuset.c.
+ * See also __cpuset_node_allowed() comment in kernel/cgroup/cpuset.c.
*/
no_fallback = alloc_flags & ALLOC_NOFRAGMENT;
z = ac->preferred_zoneref;
_
Patches currently in -mm which might be from sh_def@xxxxxxx are
mmkmemleak-testc-move-kmemleak-testc-to-samples-dir.patch
mm-vmallocc-update-the-comment-in-__vmalloc_area_node.patch
mm-vmallocc-fix-the-comment-of-find_vm_area.patch
mm-vmscan-fix-comments-for-isolate_lru_page.patch
mmz3fold-use-xx_zalloc-instead-xx_alloc-and-memset.patch
