Merge branch 'linus' into x86/asm, before applying dependent patch

[firefly-linux-kernel-4.4.55.git] / tools / perf / Documentation / perf-kmem.txt

diff --git a/tools/perf/Documentation/perf-kmem.txt b/tools/perf/Documentation/perf-kmem.txt
index 150253cc3c97dd9561610ea780b1b83b871346eb..23219c65c16f77892a30b9b85f38609f1b1dc1f5 100644 (file)
--- a/tools/perf/Documentation/perf-kmem.txt
+++ b/tools/perf/Documentation/perf-kmem.txt
@@ -3,7 +3,7 @@ perf-kmem(1)
 
 NAME
 ----
-perf-kmem - Tool to trace/measure kernel memory(slab) properties
+perf-kmem - Tool to trace/measure kernel memory properties
 
 SYNOPSIS
 --------
@@ -46,6 +46,12 @@ OPTIONS
 --raw-ip::
        Print raw ip instead of symbol
 
+--slab::
+       Analyze SLAB allocator events.
+
+--page::
+       Analyze page allocator events
+
 SEE ALSO
 --------
 linkperf:perf-record[1]