diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
| commit | 0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1 (patch) | |
| tree | 480508a78b7d9e9c0da0ffbd33b40e0b4e076a16 /mm/slab_common.c | |
| parent | 353c50ebe329daaf2c94dc41c1c481cbba2a31fd (diff) | |
| parent | 81bcfe5e48f9b8c42cf547f1c74c7f60c44c34c8 (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/slab_common.c')
| -rw-r--r-- | mm/slab_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slab_common.c b/mm/slab_common.c index 71f0b28a1bec..329b03843863 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -533,8 +533,8 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg, s = create_cache(cache_name, root_cache->object_size, root_cache->size, root_cache->align, - root_cache->flags, root_cache->ctor, - memcg, root_cache); + root_cache->flags & CACHE_CREATE_MASK, + root_cache->ctor, memcg, root_cache); /* * If we could not create a memcg cache, do not complain, because * that's not critical at all as we can always proceed with the root |