The patch titled
Subject: mm-shrinker-make-shrinker-not-depend-on-memcg-kmem-fix
has been removed from the -mm tree. Its filename was
mm-shrinker-make-shrinker-not-depend-on-memcg-kmem-fix.patch
This patch was dropped because it was folded into mm-shrinker-make-shrinker-not-depend-on-memcg-kmem.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-shrinker-make-shrinker-not-depend-on-memcg-kmem-fix
fix build
Link: http://lkml.kernel.org/r/201907052120.OGYPhvno%lkp@xxxxxxxxx
Reported-by: kbuild test robot <lkp@xxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: "Kirill A . Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memcontrol.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/include/linux/memcontrol.h~mm-shrinker-make-shrinker-not-depend-on-memcg-kmem-fix
+++ a/include/linux/memcontrol.h
@@ -128,7 +128,7 @@ struct mem_cgroup_per_node {
struct mem_cgroup_reclaim_iter iter[DEF_PRIORITY + 1];
-#ifdef CONFIG_MEMCG_KMEM
+#ifdef CONFIG_MEMCG
struct memcg_shrinker_map __rcu *shrinker_map;
#endif
struct rb_node tree_node; /* RB tree node */
@@ -1272,6 +1272,7 @@ static inline bool mem_cgroup_under_sock
struct kmem_cache *memcg_kmem_get_cache(struct kmem_cache *cachep);
void memcg_kmem_put_cache(struct kmem_cache *cachep);
+extern int memcg_expand_shrinker_maps(int new_id);
#ifdef CONFIG_MEMCG_KMEM
int __memcg_kmem_charge(struct page *page, gfp_t gfp, int order);
@@ -1339,8 +1340,6 @@ static inline int memcg_cache_id(struct
return memcg ? memcg->kmemcg_id : -1;
}
-extern int memcg_expand_shrinker_maps(int new_id);
-
extern void memcg_set_shrinker_bit(struct mem_cgroup *memcg,
int nid, int shrinker_id);
#else
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
scripts-spellingtxt-drop-sepc-from-the-misspelling-list-fix.patch
ocfs2-add-locking-filter-debugfs-file-fix.patch
ocfs2-use-kmemdup-rather-than-duplicating-its-implementation-checkpatch-fixes.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
include-linux-pfn_th-remove-pfn_t_to_virt.patch
mm-swap-use-rbtree-for-swap_extent-fix.patch
mm-shrinker-make-shrinker-not-depend-on-memcg-kmem.patch
mm-shrinker-make-shrinker-not-depend-on-memcg-kmem-fix-2-checkpatch-fixes.patch
mm-shrinker-make-shrinker-not-depend-on-memcg-kmem-fix-2-fix.patch
mm-gup-speed-up-check_and_migrate_cma_pages-on-huge-page-fix.patch
mm-vmscanc-add-checks-for-incorrect-handling-of-current-reclaim_state.patch
proc-use-down_read_killable-mmap_sem-for-proc-pid-map_files-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix-fix.patch
rbtree-avoid-generating-code-twice-for-the-cached-versions-checkpatch-fixes.patch
coda-add-hinting-support-for-partial-file-caching-fix.patch
selftests-ptrace-add-a-test-case-for-ptrace_get_syscall_info-checkpatch-fixes.patch
resource-fix-locking-in-find_next_iomem_res-fix.patch
linux-next-rejects.patch
diff-sucks.patch
mm-section-numbers-use-the-type-unsigned-long-fix.patch
mm-sparsemem-cleanup-section-number-data-types-fix.patch
proc-sysctl-add-shared-variables-for-range-check-fix-2-fix.patch
proc-sysctl-add-shared-variables-for-range-check-fix-4.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
