* [merged] mm-memcontrol-move-comments-for-get_mctgt_type-to-proper-position.patch removed from -mm tree
@ 2016-05-31 17:50 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2016-05-31 17:50 UTC (permalink / raw)
To: roy.qing.li, hannes, mhocko, mm-commits
The patch titled
Subject: mm/memcontrol.c: move comments for get_mctgt_type() to proper position
has been removed from the -mm tree. Its filename was
mm-memcontrol-move-comments-for-get_mctgt_type-to-proper-position.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Li RongQing <roy.qing.li@gmail.com>
Subject: mm/memcontrol.c: move comments for get_mctgt_type() to proper position
Move the comments for get_mctgt_type() to be before get_mctgt_type()
implementation.
Link: http://lkml.kernel.org/r/1463644638-7446-1-git-send-email-roy.qing.li@gmail.com
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/memcontrol.c | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff -puN mm/memcontrol.c~mm-memcontrol-move-comments-for-get_mctgt_type-to-proper-position mm/memcontrol.c
--- a/mm/memcontrol.c~mm-memcontrol-move-comments-for-get_mctgt_type-to-proper-position
+++ a/mm/memcontrol.c
@@ -4309,24 +4309,6 @@ static int mem_cgroup_do_precharge(unsig
return 0;
}
-/**
- * get_mctgt_type - get target type of moving charge
- * @vma: the vma the pte to be checked belongs
- * @addr: the address corresponding to the pte to be checked
- * @ptent: the pte to be checked
- * @target: the pointer the target page or swap ent will be stored(can be NULL)
- *
- * Returns
- * 0(MC_TARGET_NONE): if the pte is not a target for move charge.
- * 1(MC_TARGET_PAGE): if the page corresponding to this pte is a target for
- * move charge. if @target is not NULL, the page is stored in target->page
- * with extra refcnt got(Callers should handle it).
- * 2(MC_TARGET_SWAP): if the swap entry corresponding to this pte is a
- * target for charge migration. if @target is not NULL, the entry is stored
- * in target->ent.
- *
- * Called with pte lock held.
- */
union mc_target {
struct page *page;
swp_entry_t ent;
@@ -4515,6 +4497,25 @@ out:
return ret;
}
+/**
+ * get_mctgt_type - get target type of moving charge
+ * @vma: the vma the pte to be checked belongs
+ * @addr: the address corresponding to the pte to be checked
+ * @ptent: the pte to be checked
+ * @target: the pointer the target page or swap ent will be stored(can be NULL)
+ *
+ * Returns
+ * 0(MC_TARGET_NONE): if the pte is not a target for move charge.
+ * 1(MC_TARGET_PAGE): if the page corresponding to this pte is a target for
+ * move charge. if @target is not NULL, the page is stored in target->page
+ * with extra refcnt got(Callers should handle it).
+ * 2(MC_TARGET_SWAP): if the swap entry corresponding to this pte is a
+ * target for charge migration. if @target is not NULL, the entry is stored
+ * in target->ent.
+ *
+ * Called with pte lock held.
+ */
+
static enum mc_target_type get_mctgt_type(struct vm_area_struct *vma,
unsigned long addr, pte_t ptent, union mc_target *target)
{
_
Patches currently in -mm which might be from roy.qing.li@gmail.com are
mm-memcontrol-remove-the-useless-parameter-for-mc_handle_swap_pte.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-05-31 17:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-31 17:50 [merged] mm-memcontrol-move-comments-for-get_mctgt_type-to-proper-position.patch removed from -mm tree akpm
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.