The patch titled Subject: mm-use-special-value-shrinker_registering-instead-list_empty-check-v3 has been added to the -mm tree. Its filename is mm-use-special-value-shrinker_registering-instead-list_empty-check-v3.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-use-special-value-shrinker_registering-instead-list_empty-check-v3.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-use-special-value-shrinker_registering-instead-list_empty-check-v3.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: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx> Subject: mm-use-special-value-shrinker_registering-instead-list_empty-check-v3 add missed #ifdef CONFIG_MEMCG_KMEM around idr_replace() Link: http://lkml.kernel.org/r/758b8fec-7573-47eb-b26a-7b2847ae7b8c@xxxxxxxxxxxxx Signed-off-by: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- diff -puN mm/vmscan.c~mm-use-special-value-shrinker_registering-instead-list_empty-check-v3 mm/vmscan.c --- a/mm/vmscan.c~mm-use-special-value-shrinker_registering-instead-list_empty-check-v3 +++ a/mm/vmscan.c @@ -407,7 +407,9 @@ void register_shrinker_prepared(struct s { down_write(&shrinker_rwsem); list_add_tail(&shrinker->list, &shrinker_list); +#ifdef CONFIG_MEMCG_KMEM idr_replace(&shrinker_idr, shrinker, shrinker->id); +#endif up_write(&shrinker_rwsem); } _ Patches currently in -mm which might be from ktkhai@xxxxxxxxxxxxx are list_lru-combine-code-under-the-same-define.patch mm-introduce-config_memcg_kmem-as-combination-of-config_memcg-config_slob.patch mm-assign-id-to-every-memcg-aware-shrinker.patch mm-assign-id-to-every-memcg-aware-shrinker-v9.patch memcg-move-up-for_each_mem_cgroup-_tree-defines.patch mm-assign-memcg-aware-shrinkers-bitmap-to-memcg.patch mm-assign-memcg-aware-shrinkers-bitmap-to-memcg-v9.patch mm-assign-memcg-aware-shrinkers-bitmap-to-memcg-fix.patch mm-refactoring-in-workingset_init.patch mm-refactoring-in-workingset_init-v9.patch fs-refactoring-in-alloc_super.patch fs-propagate-shrinker-id-to-list_lru.patch list_lru-add-memcg-argument-to-list_lru_from_kmem.patch list_lru-pass-dst_memcg-argument-to-memcg_drain_list_lru_node.patch list_lru-pass-lru-argument-to-memcg_drain_list_lru_node.patch mm-export-mem_cgroup_is_root.patch mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance.patch mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9.patch mm-iterate-only-over-charged-shrinkers-during-memcg-shrink_slab.patch mm-iterate-only-over-charged-shrinkers-during-memcg-shrink_slab-v9.patch mm-add-shrink_empty-shrinker-methods-return-value.patch mm-clear-shrinker-bit-if-there-are-no-objects-related-to-memcg.patch mm-clear-shrinker-bit-if-there-are-no-objects-related-to-memcg-v9.patch mm-move-check-for-shrinker_numa_aware-to-do_shrink_slab.patch mm-use-special-value-shrinker_registering-instead-list_empty-check.patch mm-use-special-value-shrinker_registering-instead-list_empty-check-v3.patch mm-keep-int-fields-in-struct-shrink_control-together.patch mm-make-flags-of-unsigned-type-in-struct-shrinker.patch