Skip to content
  • Linus Torvalds's avatar
    Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux · ae664dba
    Linus Torvalds authored
    Pull SLAB changes from Pekka Enberg:
     "This contains preparational work from Christoph Lameter and Glauber
      Costa for SLAB memcg and cleanups and improvements from Ezequiel
      Garcia and Joonsoo Kim.
    
      Please note that the SLOB cleanup commit from Arnd Bergmann already
      appears in your tree but I had also merged it myself which is why it
      shows up in the shortlog."
    
    * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
      mm/sl[aou]b: Common alignment code
      slab: Use the new create_boot_cache function to simplify bootstrap
      slub: Use statically allocated kmem_cache boot structure for bootstrap
      mm, sl[au]b: create common functions for boot slab creation
      slab: Simplify bootstrap
      slub: Use correct cpu_slab on dead cpu
      mm: fix slab.c kernel-doc warnings
      mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN
      slab: Ignore internal flags in cache creation
      mm/slob: Use free_page instead of put_page for page-size kmalloc allocations
      mm/sl[aou]b: Move common kmem_cache_size() to slab.h
      mm/slob: Use object_size field in kmem_cache_size()
      mm/slob: Drop usage of page->private for storing page-sized allocations
      slub: Commonize slab_cache field in struct page
      sl[au]b: Process slabinfo_show in common code
      mm/sl[au]b: Move print_slabinfo_header to slab_common.c
      mm/sl[au]b: Move slabinfo processing to slab_common.c
      slub: remove one code path and reduce lock contention in __slab_free()
    ae664dba