diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-15 02:14:29 +0400 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-15 02:14:29 +0400 | 
| commit | 54be8200198ddfc6cb396720460c19881fac2d5a (patch) | |
| tree | 58ccab6e0cfb35b30e7e16804f15fe9c94628f12 /kernel/locking/mutex-debug.c | |
| parent | 41d9884c44237cd66e2bdbc412028b29196b344c (diff) | |
| parent | c25f195e828f847735c7626b5693ddc3b853d245 (diff) | |
| download | linux-54be8200198ddfc6cb396720460c19881fac2d5a.tar.xz | |
Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
Pull slab update from Pekka Enberg:
 "Highlights:
  - Fix for boot-time problems on some architectures due to
    init_lock_keys() not respecting kmalloc_caches boundaries
    (Christoph Lameter)
  - CONFIG_SLUB_CPU_PARTIAL requested by RT folks (Joonsoo Kim)
  - Fix for excessive slab freelist draining (Wanpeng Li)
  - SLUB and SLOB cleanups and fixes (various people)"
I ended up editing the branch, and this avoids two commits at the end
that were immediately reverted, and I instead just applied the oneliner
fix in between myself.
* 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
  slub: Check for page NULL before doing the node_match check
  mm/slab: Give s_next and s_stop slab-specific names
  slob: Check for NULL pointer before calling ctor()
  slub: Make cpu partial slab support configurable
  slab: add kmalloc() to kernel API documentation
  slab: fix init_lock_keys
  slob: use DIV_ROUND_UP where possible
  slub: do not put a slab to cpu partial list when cpu_partial is 0
  mm/slub: Use node_nr_slabs and node_nr_objs in get_slabinfo
  mm/slub: Drop unnecessary nr_partials
  mm/slab: Fix /proc/slabinfo unwriteable for slab
  mm/slab: Sharing s_next and s_stop between slab and slub
  mm/slab: Fix drain freelist excessively
  slob: Rework #ifdeffery in slab.h
  mm, slab: moved kmem_cache_alloc_node comment to correct place
Diffstat (limited to 'kernel/locking/mutex-debug.c')
0 files changed, 0 insertions, 0 deletions
