diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 12:47:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 12:47:55 -0700 |
| commit | 76c39e4fef73e42777c27d6b87a04f89ebd0ef66 (patch) | |
| tree | 40f490c46a409bfe4cecd99cf08ad709065d116b /block/blk-timeout.c | |
| parent | 1765a1fe5d6f82c0eceb1ad10594cfc83759b6d0 (diff) | |
| parent | 6d4121f6c20a0e86231d52f535f1c82423b3326f (diff) | |
| download | op-kernel-dev-76c39e4fef73e42777c27d6b87a04f89ebd0ef66.zip op-kernel-dev-76c39e4fef73e42777c27d6b87a04f89ebd0ef66.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: (27 commits)
SLUB: Fix memory hotplug with !NUMA
slub: Move functions to reduce #ifdefs
slub: Enable sysfs support for !CONFIG_SLUB_DEBUG
SLUB: Optimize slab_free() debug check
slub: Move NUMA-related functions under CONFIG_NUMA
slub: Add lock release annotation
slub: Fix signedness warnings
slub: extract common code to remove objects from partial list without locking
SLUB: Pass active and inactive redzone flags instead of boolean to debug functions
slub: reduce differences between SMP and NUMA
Revert "Slub: UP bandaid"
percpu: clear memory allocated with the km allocator
percpu: use percpu allocator on UP too
percpu: reduce PCPU_MIN_UNIT_SIZE to 32k
vmalloc: pcpu_get/free_vm_areas() aren't needed on UP
SLUB: Fix merged slab cache names
Slub: UP bandaid
slub: fix SLUB_RESILIENCY_TEST for dynamic kmalloc caches
slub: Fix up missing kmalloc_cache -> kmem_cache_node case for memoryhotplug
slub: Add dummy functions for the !SLUB_DEBUG case
...
Diffstat (limited to 'block/blk-timeout.c')
0 files changed, 0 insertions, 0 deletions
