The patch titled
Subject: secretmem-add-memcg-accounting-fix
has been added to the -mm tree. Its filename is
secretmem-add-memcg-accounting-fix.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/secretmem-add-memcg-accounting-fix.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/secretmem-add-memcg-accounting-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: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: secretmem-add-memcg-accounting-fix
fix CONFIG_MEMCG=n build
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/filemap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mm/filemap.c~secretmem-add-memcg-accounting-fix
+++ a/mm/filemap.c
@@ -844,7 +844,7 @@ static noinline int __add_to_page_cache_
page->mapping = mapping;
page->index = offset;
- if (!huge && !page->memcg_data) {
+ if (!huge && !page_memcg(page)) {
error = mem_cgroup_charge(page, current->mm, gfp);
if (error)
goto error;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
kthread_worker-document-cpu-hotplug-handling-fix.patch
mm.patch
mm-prevent-gup_fast-from-racing-with-cow-during-fork-checkpatch-fixes.patch
mm-swap_state-skip-meaningless-swap-cache-readahead-when-ra_infowin-==-0-fix.patch
mm-vmallocc-__vmalloc_area_node-avoid-32-bit-overflow.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
lib-test_bitmapc-add-for_each_set_clump-test-cases-checkpatch-fixes.patch
linux-next-rejects.patch
kasan-split-out-shadowc-from-commonc-fix.patch
kasan-mm-check-kasan_enabled-in-annotations-fix.patch
kasan-mm-rename-kasan_poison_kfree-temp-fix.patch
secretmem-add-memcg-accounting-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
