X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=mm%2Fslab.c;h=e3a236cd1574420f70c6936c1770bb71b251f04f;hb=fc5ee888ab2a5396ec1f5113a4860f1aafc08ecf;hp=4e51ef954026bd15e5bef41167459970976faab0;hpb=9ddd0c131a1aaa9a0047ecdfac8e935aed0f7206;p=mirror_ubuntu-bionic-kernel.git

diff --git a/mm/slab.c b/mm/slab.c
index 4e51ef954026..e3a236cd1574 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1283,6 +1283,7 @@ void __init kmem_cache_init(void)
 				  nr_node_ids * sizeof(struct kmem_cache_node *),
 				  SLAB_HWCACHE_ALIGN);
 	list_add(&kmem_cache->list, &slab_caches);
+	memcg_link_cache(kmem_cache);
 	slab_state = PARTIAL;
 
 	/*
@@ -4076,7 +4077,8 @@ next:
 	next_reap_node();
 out:
 	/* Set up the next iteration */
-	schedule_delayed_work(work, round_jiffies_relative(REAPTIMEOUT_AC));
+	schedule_delayed_work_on(smp_processor_id(), work,
+				round_jiffies_relative(REAPTIMEOUT_AC));
 }
 
 void get_slabinfo(struct kmem_cache *cachep, struct slabinfo *sinfo)