diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 14:32:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 14:32:47 +1000 |
| commit | 3d0614ce9d067135ec75433a4649c555afa1b776 (patch) | |
| tree | f79cf32b076c2754ce8e35e940cf545b04d76c9e /mm/slub.c | |
| parent | 9f6674cef7499dae038a0b2e2f556f1f99647372 (diff) | |
| parent | 7f004d4884d4b78c6ac68cc6cd6a105f21ed047b (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c index 1d3f9835f4ea..5ac0b5ad029b 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3358,8 +3358,8 @@ static void free_kmem_cache_nodes(struct kmem_cache *s) struct kmem_cache_node *n; for_each_kmem_cache_node(s, node, n) { - kmem_cache_free(kmem_cache_node, n); s->node[node] = NULL; + kmem_cache_free(kmem_cache_node, n); } } @@ -3389,8 +3389,8 @@ static int init_kmem_cache_nodes(struct kmem_cache *s) return 0; } - s->node[node] = n; init_kmem_cache_node(n); + s->node[node] = n; } return 1; } |