Skip to content
  • Linus Torvalds's avatar
    Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux · 125b79d7
    Linus Torvalds authored
    Pull SLAB changes from Pekka Enberg:
     "New and noteworthy:
    
      * More SLAB allocator unification patches from Christoph Lameter and
        others.  This paves the way for slab memcg patches that hopefully
        will land in v3.8.
    
      * SLAB tracing improvements from Ezequiel Garcia.
    
      * Kernel tainting upon SLAB corruption from Dave Jones.
    
      * Miscellanous SLAB allocator bug fixes and improvements from various
        people."
    
    * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux: (43 commits)
      slab: Fix build failure in __kmem_cache_create()
      slub: init_kmem_cache_cpus() and put_cpu_partial() can be static
      mm/slab: Fix kmem_cache_alloc_node_trace() declaration
      Revert "mm/slab: Fix kmem_cache_alloc_node_trace() declaration"
      mm, slob: fix build breakage in __kmalloc_node_track_caller
      mm/slab: Fix kmem_cache_alloc_node_trace() declaration
      mm/slab: Fix typo _RET_IP -> _RET_IP_
      mm, slub: Rename slab_alloc() -> slab_alloc_node() to match SLAB
      mm, slab: Rename __cache_alloc() -> slab_alloc()
      mm, slab: Match SLAB and SLUB kmem_cache_alloc_xxx_trace() prototype
      mm, slab: Replace 'caller' type, void* -> unsigned long
      mm, slob: Add support for kmalloc_track_caller()
      mm, slab: Remove silly function slab_buffer_size()
      mm, slob: Use NUMA_NO_NODE instead of -1
      mm, sl[au]b: Taint kernel when we detect a corrupted slab
      slab: Only define slab_error for DEBUG
      slab: fix the DEADLOCK issue on l3 alien lock
      slub: Zero initial memory segment for kmem_cache and kmem_cache_node
      Revert "mm/sl[aou]b: Move sysfs_slab_add to common"
      mm/sl[aou]b: Move kmem_cache refcounting to common code
      ...
    125b79d7