diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-11 08:25:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-11 08:25:07 +0100 |
| commit | 4c8ee71620d734c8ad129fad085167f56f9ce351 (patch) | |
| tree | 87208b0144aa664c96dd8b43bbcaaf1f25af606b /mm/slab.h | |
| parent | c7faee2109f978f3ef826c48b7e60609061fda4f (diff) | |
| parent | 27bcd37e0240bbe33f0efe244b5aad52104115b3 (diff) | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/slab.h')
| -rw-r--r-- | mm/slab.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/slab.h b/mm/slab.h index 9653f2e2591a..bc05fdc3edce 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -432,6 +432,7 @@ struct kmem_cache_node { struct list_head slabs_partial; /* partial list first, better asm code */ struct list_head slabs_full; struct list_head slabs_free; + unsigned long num_slabs; unsigned long free_objects; unsigned int free_limit; unsigned int colour_next; /* Per-node cache coloring */ |