diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-18 06:40:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-18 06:40:47 +0200 |
| commit | e3a8b6a1e70c37702054ae3c7c07ed828435d8ee (patch) | |
| tree | f1e15d987dcfd84b61f370b9ab71f833513c5429 /mm/slab.h | |
| parent | Merge tag 'arc-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc (diff) | |
| parent | mm: Remove slab from struct page (diff) | |
| download | linux-dev-e3a8b6a1e70c37702054ae3c7c07ed828435d8ee.tar.xz linux-dev-e3a8b6a1e70c37702054ae3c7c07ed828435d8ee.zip | |
Merge tag 'slab-for-5.17-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab
Pull more slab updates from Vlastimil Babka:
"Finish the conversion to struct slab by removing slab-specific fields
from struct page.
The first slab update (see merge commit ca1a46d6f506) did most of the
conversion, but there was also series in iommu tree removing the
iommu's usage of struct page 'freelist' field, blocking the final
struct page cleanup.
Now that the iommu changes have been merged, we can finish the job"
* tag 'slab-for-5.17-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
mm: Remove slab from struct page
Diffstat (limited to 'mm/slab.h')
| -rw-r--r-- | mm/slab.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mm/slab.h b/mm/slab.h index 7edb7d23f141..c7f2abc2b154 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -67,14 +67,8 @@ struct slab { static_assert(offsetof(struct page, pg) == offsetof(struct slab, sl)) SLAB_MATCH(flags, __page_flags); SLAB_MATCH(compound_head, slab_list); /* Ensure bit 0 is clear */ -SLAB_MATCH(slab_list, slab_list); #ifndef CONFIG_SLOB SLAB_MATCH(rcu_head, rcu_head); -SLAB_MATCH(slab_cache, slab_cache); -#endif -#ifdef CONFIG_SLAB -SLAB_MATCH(s_mem, s_mem); -SLAB_MATCH(active, active); #endif SLAB_MATCH(_refcount, __page_refcount); #ifdef CONFIG_MEMCG |