diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /Documentation/vm/00-INDEX | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'Documentation/vm/00-INDEX')
| -rw-r--r-- | Documentation/vm/00-INDEX | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/vm/00-INDEX b/Documentation/vm/00-INDEX index 2f77ced35df7..e57d6a9dd32b 100644 --- a/Documentation/vm/00-INDEX +++ b/Documentation/vm/00-INDEX | |||
| @@ -6,6 +6,8 @@ balance | |||
| 6 | - various information on memory balancing. | 6 | - various information on memory balancing. |
| 7 | hugetlbpage.txt | 7 | hugetlbpage.txt |
| 8 | - a brief summary of hugetlbpage support in the Linux kernel. | 8 | - a brief summary of hugetlbpage support in the Linux kernel. |
| 9 | ksm.txt | ||
| 10 | - how to use the Kernel Samepage Merging feature. | ||
| 9 | locking | 11 | locking |
| 10 | - info on how locking and synchronization is done in the Linux vm code. | 12 | - info on how locking and synchronization is done in the Linux vm code. |
| 11 | numa | 13 | numa |
| @@ -20,3 +22,5 @@ slabinfo.c | |||
| 20 | - source code for a tool to get reports about slabs. | 22 | - source code for a tool to get reports about slabs. |
| 21 | slub.txt | 23 | slub.txt |
| 22 | - a short users guide for SLUB. | 24 | - a short users guide for SLUB. |
| 25 | map_hugetlb.c | ||
| 26 | - an example program that uses the MAP_HUGETLB mmap flag. | ||