diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 10:10:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 10:10:44 -0700 |
| commit | 4867faab1e3eb8cc3f74e390357615d9b8e8cda6 (patch) | |
| tree | 7a6cb9175c483a0f7e3672185e7f9fb25f74caa3 /net | |
| parent | 6fad2b5b649fa1fa6ee7293222815f5b62499889 (diff) | |
| parent | bfb91fb650e988c3c347e50fc75fedb7d4f0c018 (diff) | |
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:
slub: Deal with hyperthetical case of PAGE_SIZE > 2M
slub: Remove node check in slab_free
slub: avoid label inside conditional
slub: Make CONFIG_DEBUG_PAGE_ALLOC work with new fastpath
slub: Avoid warning for !CONFIG_SLUB_DEBUG
slub: Remove CONFIG_CMPXCHG_LOCAL ifdeffery
slub: Move debug handlign in __slab_free
slub: Move node determination out of hotpath
slub: Eliminate repeated use of c->page through a new page variable
slub: get_map() function to establish map of free objects in a slab
slub: Use NUMA_NO_NODE in get_partial
slub: Fix a typo in config name
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions