The patch titled Subject: memcg, kmem: mark cancel_charge() inline has been removed from the -mm tree. Its filename was memcg-kmem-further-deprecate-kmemlimit_in_bytes-fix.patch This patch was dropped because it was folded into memcg-kmem-further-deprecate-kmemlimit_in_bytes.patch ------------------------------------------------------ From: Arnd Bergmann <arnd@xxxxxxxx> Subject: memcg, kmem: mark cancel_charge() inline cancel_charge() is no longer called for CONFIG_MEMCG_KMEM on NOMMU targets, which causes a compiletime warning: mm/memcontrol.c:2774:13: error: unused function 'cancel_charge' [-Werror,-Wunused-function] Remove the now-incorrect #ifdef and just mark the function 'inline' like the other related helpers. This is simpler and means we no longer have to match the #ifdef with the caller. Link: https://lkml.kernel.org/r/20211022070542.679839-1-arnd@xxxxxxxxxx Fixes: 5f3345c17079 ("memcg, kmem: further deprecate kmem.limit_in_bytes") Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> Reviewed-by: Muchun Song <songmuchun@xxxxxxxxxxxxx> Cc: Shakeel Butt <shakeelb@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxxxx> Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Roman Gushchin <guro@xxxxxx> Cc: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx> Cc: Waiman Long <longman@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/mm/memcontrol.c~memcg-kmem-further-deprecate-kmemlimit_in_bytes-fix +++ a/mm/memcontrol.c @@ -2771,8 +2771,7 @@ static inline int try_charge(struct mem_ return try_charge_memcg(memcg, gfp_mask, nr_pages); } -#if defined(CONFIG_MEMCG_KMEM) || defined(CONFIG_MMU) -static void cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pages) +static inline void cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pages) { if (mem_cgroup_is_root(memcg)) return; @@ -2781,7 +2780,6 @@ static void cancel_charge(struct mem_cgr if (do_memsw_account()) page_counter_uncharge(&memcg->memsw, nr_pages); } -#endif static void commit_charge(struct page *page, struct mem_cgroup *memcg) { _ Patches currently in -mm which might be from arnd@xxxxxxxx are posix-acl-avoid-wempty-body-warning.patch memcg-kmem-further-deprecate-kmemlimit_in_bytes.patch mm-shmem-dont-truncate-page-if-memory-failure-happens-fix-2.patch kasan-test-use-underlying-string-helpers.patch hfs-hfsplus-use-warn_on-for-sanity-check.patch