summaryrefslogtreecommitdiffstats
path: root/Documentation/vm/00-INDEX
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-10-06 15:02:30 +0200
committerIngo Molnar <mingo@elte.hu>2009-10-06 15:02:34 +0200
commitd9b2002c406011164f245de7a81304625989f1c9 (patch)
treea2bb74773cd1409acbec5eb2fbba2ae9889d55e8 /Documentation/vm/00-INDEX
parentc3b32fcbc7f4fd9a9b84718b991b175b0fd53f8c (diff)
parent906010b2134e14a2e377decbadd357b3d0ab9c6a (diff)
downloadlinux-d9b2002c406011164f245de7a81304625989f1c9.tar.gz
linux-d9b2002c406011164f245de7a81304625989f1c9.tar.bz2
linux-d9b2002c406011164f245de7a81304625989f1c9.zip
Merge branch 'perf/urgent' into perf/core
Merge reason: Upcoming patch is dependent on a fix in perf/urgent. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/vm/00-INDEX')
-rw-r--r--Documentation/vm/00-INDEX4
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
- various information on memory balancing.
hugetlbpage.txt
- a brief summary of hugetlbpage support in the Linux kernel.
+ksm.txt
+ - how to use the Kernel Samepage Merging feature.
locking
- info on how locking and synchronization is done in the Linux vm code.
numa
@@ -20,3 +22,5 @@ slabinfo.c
- source code for a tool to get reports about slabs.
slub.txt
- a short users guide for SLUB.
+map_hugetlb.c
+ - an example program that uses the MAP_HUGETLB mmap flag.