diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-01 19:50:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-01 19:50:23 -0400 |
| commit | af4f8ba31a4e328677bec493ceeaf112ca193b65 (patch) | |
| tree | d97a6dc3a8ddcd2bcebe124a4716e565a7868cdc /Documentation/vm | |
| parent | efff0471b0dd8b08ca3830b06a9083f6d6cef44e (diff) | |
| parent | c03f94ccbd67fbcf546e5a9fcfeb99ef0aca4ada (diff) | |
Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
Pull slab updates from Pekka Enberg:
"Mainly a bunch of SLUB fixes from Joonsoo Kim"
* 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
slub: use __SetPageSlab function to set PG_slab flag
slub: fix a memory leak in get_partial_node()
slub: remove unused argument of init_kmem_cache_node()
slub: fix a possible memory leak
Documentations: Fix slabinfo.c directory in vm/slub.txt
slub: fix incorrect return type of get_any_partial()
Diffstat (limited to 'Documentation/vm')
| -rw-r--r-- | Documentation/vm/slub.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt index 6752870c4970..b0c6d1bbb434 100644 --- a/Documentation/vm/slub.txt +++ b/Documentation/vm/slub.txt | |||
| @@ -17,7 +17,7 @@ data and perform operation on the slabs. By default slabinfo only lists | |||
| 17 | slabs that have data in them. See "slabinfo -h" for more options when | 17 | slabs that have data in them. See "slabinfo -h" for more options when |
| 18 | running the command. slabinfo can be compiled with | 18 | running the command. slabinfo can be compiled with |
| 19 | 19 | ||
| 20 | gcc -o slabinfo tools/slub/slabinfo.c | 20 | gcc -o slabinfo tools/vm/slabinfo.c |
| 21 | 21 | ||
| 22 | Some of the modes of operation of slabinfo require that slub debugging | 22 | Some of the modes of operation of slabinfo require that slub debugging |
| 23 | be enabled on the command line. F.e. no tracking information will be | 23 | be enabled on the command line. F.e. no tracking information will be |