The patch titled
Subject: fixup: vmscan: Fix build on !CONFIG_MEMCG from nr_deactivate changes
has been added to the -mm tree. Its filename is
mm-move-nr_deactivate-accounting-to-shrink_active_list-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-move-nr_deactivate-accounting-to-shrink_active_list-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-move-nr_deactivate-accounting-to-shrink_active_list-fix.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: Chris Down <chris@xxxxxxxxxxxxxx>
Subject: fixup: vmscan: Fix build on !CONFIG_MEMCG from nr_deactivate changes
"mm: move nr_deactivate accounting to shrink_active_list()" uses the
non-irqsaved version of count_memcg_events (__count_memcg_events), but
we've only exported the irqsaving version of it to userspace, so the build
breaks:
mm/vmscan.c: In function `shrink_active_list':
mm/vmscan.c:2101:2: error: implicit declaration of function `__count_memcg_events'; did you mean `count_memcg_events'? [-Werror=implicit-function-declaration]
This fixup makes it build with !CONFIG_MEMCG.
Link: http://lkml.kernel.org/r/20190322150513.GA22021@xxxxxxxxxxxxxx
Signed-off-by: Chris Down <chris@xxxxxxxxxxxxxx>
Cc: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memcontrol.h | 6 ++++++
1 file changed, 6 insertions(+)
--- a/include/linux/memcontrol.h~mm-move-nr_deactivate-accounting-to-shrink_active_list-fix
+++ a/include/linux/memcontrol.h
@@ -1114,6 +1114,12 @@ static inline void count_memcg_events(st
{
}
+static inline void __count_memcg_events(struct mem_cgroup *memcg,
+ enum vm_event_item idx,
+ unsigned long count)
+{
+}
+
static inline void count_memcg_page_event(struct page *page,
int idx)
{
_
Patches currently in -mm which might be from chris@xxxxxxxxxxxxxx are
mm-move-nr_deactivate-accounting-to-shrink_active_list-fix.patch
mm-proportional-memorylowmin-reclaim.patch
mm-make-memoryemin-the-baseline-for-utilisation-determination.patch
mm-memcg-make-scan-aggression-always-exclude-protection.patch
mm-rename-ambiguously-named-memorystat-counters-and-functions.patch
mm-consider-subtrees-in-memoryevents.patch
