aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2009-10-07 19:32:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-08 10:36:39 -0400
commita1bbb5ec39042fb762e7f4bcc634da0d87834193 (patch)
tree20bb538ee4b3a9fbf5e8e9d1988fed2011deffce
parent253fb02d62571e5455eedc9e39b9d660e86a40f0 (diff)
pagemap: document KPF_KSM and show it in page-types
It indicates to the system admin that processes mapping such pages may be eating less physical memory than the reported numbers by legacy tools. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk> Cc: Izik Eidus <ieidus@redhat.com> Acked-by: Chris Wright <chrisw@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/vm/page-types.c2
-rw-r--r--Documentation/vm/pagemap.txt4
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/vm/page-types.c b/Documentation/vm/page-types.c
index 87f57228f56e..9899fa239eed 100644
--- a/Documentation/vm/page-types.c
+++ b/Documentation/vm/page-types.c
@@ -71,6 +71,7 @@
71#define KPF_UNEVICTABLE 18 71#define KPF_UNEVICTABLE 18
72#define KPF_HWPOISON 19 72#define KPF_HWPOISON 19
73#define KPF_NOPAGE 20 73#define KPF_NOPAGE 20
74#define KPF_KSM 21
74 75
75/* [32-] kernel hacking assistances */ 76/* [32-] kernel hacking assistances */
76#define KPF_RESERVED 32 77#define KPF_RESERVED 32
@@ -119,6 +120,7 @@ static char *page_flag_names[] = {
119 [KPF_UNEVICTABLE] = "u:unevictable", 120 [KPF_UNEVICTABLE] = "u:unevictable",
120 [KPF_HWPOISON] = "X:hwpoison", 121 [KPF_HWPOISON] = "X:hwpoison",
121 [KPF_NOPAGE] = "n:nopage", 122 [KPF_NOPAGE] = "n:nopage",
123 [KPF_KSM] = "x:ksm",
122 124
123 [KPF_RESERVED] = "r:reserved", 125 [KPF_RESERVED] = "r:reserved",
124 [KPF_MLOCKED] = "m:mlocked", 126 [KPF_MLOCKED] = "m:mlocked",
diff --git a/Documentation/vm/pagemap.txt b/Documentation/vm/pagemap.txt
index 2fdd84a19109..df09b9650a81 100644
--- a/Documentation/vm/pagemap.txt
+++ b/Documentation/vm/pagemap.txt
@@ -59,6 +59,7 @@ There are three components to pagemap:
59 18. UNEVICTABLE 59 18. UNEVICTABLE
60 19. HWPOISON 60 19. HWPOISON
61 20. NOPAGE 61 20. NOPAGE
62 21. KSM
62 63
63Short descriptions to the page flags: 64Short descriptions to the page flags:
64 65
@@ -93,6 +94,9 @@ Short descriptions to the page flags:
9320. NOPAGE 9420. NOPAGE
94 no page frame exists at the requested address 95 no page frame exists at the requested address
95 96
9721. KSM
98 identical memory pages dynamically shared between one or more processes
99
96 [IO related page flags] 100 [IO related page flags]
97 1. ERROR IO error occurred 101 1. ERROR IO error occurred
98 3. UPTODATE page has up-to-date data 102 3. UPTODATE page has up-to-date data