diff options
author | Pekka Enberg <penberg@kernel.org> | 2012-12-18 12:46:20 +0200 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2012-12-18 12:46:20 +0200 |
commit | 08afe22c68d8c07e8e31ee6491c37f36199ba14b (patch) | |
tree | 875d203149b74fddb50522fd5df3d6b154f5fe1e /include/linux/mm_types.h | |
parent | a304f836a2e6d257c1f918b3431f97ef6b33e02e (diff) | |
parent | 4590685546a374fb0f60682ce0e3a6fd48911d46 (diff) | |
download | op-kernel-dev-08afe22c68d8c07e8e31ee6491c37f36199ba14b.zip op-kernel-dev-08afe22c68d8c07e8e31ee6491c37f36199ba14b.tar.gz |
Merge branch 'slab/next' into slab/for-linus
Fix up a trivial merge conflict with commit baaf1dd ("mm/slob: use
min_t() to compare ARCH_SLAB_MINALIGN") that did not go through the slab
tree.
Conflicts:
mm/slob.c
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'include/linux/mm_types.h')
-rw-r--r-- | include/linux/mm_types.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 31f8a3a..2fef4e7 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -128,10 +128,7 @@ struct page { }; struct list_head list; /* slobs list of pages */ - struct { /* slab fields */ - struct kmem_cache *slab_cache; - struct slab *slab_page; - }; + struct slab *slab_page; /* slab fields */ }; /* Remainder is not double word aligned */ @@ -146,7 +143,7 @@ struct page { #if USE_SPLIT_PTLOCKS spinlock_t ptl; #endif - struct kmem_cache *slab; /* SLUB: Pointer to slab */ + struct kmem_cache *slab_cache; /* SL[AU]B: Pointer to slab */ struct page *first_page; /* Compound tail pages */ }; |