From: Greg Kroah-Hartman Date: Mon, 15 Aug 2016 11:28:44 +0000 (+0200) Subject: updated queue-4.4/mm-memcontrol-fix-cgroup-creation-failure-after-many-small-jobs... X-Git-Tag: v3.14.76~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75c4a02e1cff62114202b639913645e7b1569cb5;p=thirdparty%2Fkernel%2Fstable-queue.git updated queue-4.4/mm-memcontrol-fix-cgroup-creation-failure-after-many-small-jobs.patch --- diff --git a/queue-4.4/mm-memcontrol-fix-cgroup-creation-failure-after-many-small-jobs.patch b/queue-4.4/mm-memcontrol-fix-cgroup-creation-failure-after-many-small-jobs.patch index c0088c0c750..84b87406e4a 100644 --- a/queue-4.4/mm-memcontrol-fix-cgroup-creation-failure-after-many-small-jobs.patch +++ b/queue-4.4/mm-memcontrol-fix-cgroup-creation-failure-after-many-small-jobs.patch @@ -75,8 +75,8 @@ Signed-off-by: Greg Kroah-Hartman --- include/linux/memcontrol.h | 8 +++ mm/memcontrol.c | 95 ++++++++++++++++++++++++++++++++++++--------- - mm/slab_common.c | 2 - 3 files changed, 85 insertions(+), 20 deletions(-) + mm/slab_common.c | 4 - + 3 files changed, 86 insertions(+), 21 deletions(-) --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -267,11 +267,13 @@ Signed-off-by: Greg Kroah-Hartman } --- a/mm/slab_common.c +++ b/mm/slab_common.c -@@ -522,7 +522,7 @@ void memcg_create_kmem_cache(struct mem_ +@@ -521,8 +521,8 @@ void memcg_create_kmem_cache(struct mem_ + goto out_unlock; cgroup_name(css->cgroup, memcg_name_buf, sizeof(memcg_name_buf)); - cache_name = kasprintf(GFP_KERNEL, "%s(%d:%s)", root_cache->name, +- cache_name = kasprintf(GFP_KERNEL, "%s(%d:%s)", root_cache->name, - css->id, memcg_name_buf); ++ cache_name = kasprintf(GFP_KERNEL, "%s(%llu:%s)", root_cache->name, + css->serial_nr, memcg_name_buf); if (!cache_name) goto out_unlock;