The patch titled Subject: mm/list_lru.c: fold __list_lru_count_one() into its caller has been added to the -mm tree. Its filename is mm-list_lruc-fold-__list_lru_count_one-into-its-caller.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-list_lruc-fold-__list_lru_count_one-into-its-caller.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-list_lruc-fold-__list_lru_count_one-into-its-caller.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/list_lru.c: fold __list_lru_count_one() into its caller __list_lru_count_one() has a single callsite. Cc: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> Cc: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx> Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/list_lru.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff -puN mm/list_lru.c~mm-list_lruc-fold-__list_lru_count_one-into-its-caller mm/list_lru.c --- a/mm/list_lru.c~mm-list_lruc-fold-__list_lru_count_one-into-its-caller +++ a/mm/list_lru.c @@ -162,26 +162,20 @@ void list_lru_isolate_move(struct list_l } EXPORT_SYMBOL_GPL(list_lru_isolate_move); -static unsigned long __list_lru_count_one(struct list_lru *lru, - int nid, int memcg_idx) +unsigned long list_lru_count_one(struct list_lru *lru, + int nid, struct mem_cgroup *memcg) { struct list_lru_node *nlru = &lru->node[nid]; struct list_lru_one *l; unsigned long count; rcu_read_lock(); - l = list_lru_from_memcg_idx(nlru, memcg_idx); + l = list_lru_from_memcg_idx(nlru, memcg_cache_id(memcg)); count = l->nr_items; rcu_read_unlock(); return count; } - -unsigned long list_lru_count_one(struct list_lru *lru, - int nid, struct mem_cgroup *memcg) -{ - return __list_lru_count_one(lru, nid, memcg_cache_id(memcg)); -} EXPORT_SYMBOL_GPL(list_lru_count_one); unsigned long list_lru_count_node(struct list_lru *lru, int nid) _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes.patch mm.patch tools-modifying-page-types-to-include-shared-map-counts-checkpatch-fixes.patch tools-adding-support-for-idle-page-tracking-to-tool-fix.patch mm-list_lruc-fold-__list_lru_count_one-into-its-caller.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch mm-oom-cgroup-aware-oom-killer-fix.patch mm-oom-cgroup-aware-oom-killer-fix-2.patch mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch kernel-hung_taskc-allow-to-set-checking-interval-separately-from-timeout-fix.patch linux-next-rejects.patch linux-next-git-rejects.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