Skip to contentSkip to conversation

mm-memcg-declare-do_memsw_account-inline.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Dec 6, 2024 Stable branch

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: memcg: declare do_memsw_account inline
has been removed from the -mm tree. Its filename was
mm-memcg-declare-do_memsw_account-inline.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: John Sperbeck <[email protected]>
Subject: mm: memcg: declare do_memsw_account inline
Date: Thu, 28 Nov 2024 12:39:59 -0800

In commit 66d60c428b23 ("mm: memcg: move legacy memcg event code into memcontrol-v1.c"), the static do_memsw_account() function was moved from a .c file to a .h file. Unfortunately, the traditional inline keyword wasn't added. If a file (e.g., a unit test) includes the .h file, but doesn't refer to do_memsw_account(), it will get a warning like:

mm/memcontrol-v1.h:41:13: warning: unused function 'do_memsw_account' [-Wunused-function]
41 | static bool do_memsw_account(void)

      |             ^~~~~~~~~~~~~~~~
Fixes 66d60c428b23 ("mm: memcg: move legacy memcg event code into memcontrol-v1.c")
Cc Johannes Weiner <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Muchun Song <[email protected]>
Cc Shakeel Butt <[email protected]>

---

 mm/memcontrol-v1.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~mm-memcg-declare-do_memsw_account-inline +1 -1
@@ -38,7 +38,7 @@ void mem_cgroup_id_put_many(struct mem_c
 	     iter = mem_cgroup_iter(NULL, iter, NULL))
 
 /* Whether legacy memory+swap accounting is active */
-static bool do_memsw_account(void)
+static inline bool do_memsw_account(void)
 {
 	return !cgroup_subsys_on_dfl(memory_cgrp_subsys);
 }

_

Patches currently in -mm which might be from [email protected] are