updated queue-4.4/mm-memcontrol-fix-cgroup-creation-failure-after-many-small-jobs...

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 c0088c0c750a23381fc7e7ffa5a8fef82266707c..84b87406e4abd9cb83dad8ea4bff71849dabb61f 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 ---
  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 <gregkh@linuxfoundation.org>
  }
 --- 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;