diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 01:35:40 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 01:35:40 +0300 |
| commit | 64096c17417380d8a472d096645f4cbc9406c987 (patch) | |
| tree | e01d22012de7694206143b5606f7d51f225eb249 /Documentation | |
| parent | cc7889ff5ee7a1c1a2b5073c53db5ad9b76f14e2 (diff) | |
| parent | 1154fab73ccbab010cfaa272b6987c624cfd63c6 (diff) | |
| download | linux-64096c17417380d8a472d096645f4cbc9406c987.tar.xz | |
Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
SLUB: Fix per-cpu merge conflict
failslab: add ability to filter slab caches
slab: fix regression in touched logic
dma kmalloc handling fixes
slub: remove impossible condition
slab: initialize unused alien cache entry as NULL at alloc_alien_cache().
SLUB: Make slub statistics use this_cpu_inc
SLUB: this_cpu: Remove slub kmem_cache fields
SLUB: Get rid of dynamic DMA kmalloc cache allocation
SLUB: Use this_cpu operations in slub
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/vm/slub.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt index b37300edf27c..07375e73981a 100644 --- a/Documentation/vm/slub.txt +++ b/Documentation/vm/slub.txt @@ -41,6 +41,7 @@ Possible debug options are P Poisoning (object and padding) U User tracking (free and alloc) T Trace (please only use on single slabs) + A Toggle failslab filter mark for the cache O Switch debugging off for caches that would have caused higher minimum slab orders - Switch all debugging off (useful if the kernel is |