diff options
author | Ulrich Drepper <drepper@akkadia.org> | 2012-05-29 18:06:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-29 19:22:21 -0400 |
commit | 9295b7a07c859a42346221b5839be0ae612333b0 (patch) | |
tree | 67efb39934130c62eb899d02214c0fd68d4128f5 | |
parent | a62e2f4f508863da8e0c2f2b42f5252a87330297 (diff) |
kbuild: install kernel-page-flags.h
Programs using /proc/kpageflags need to know about the various flags. The
<linux/kernel-page-flags.h> provides them and the comments in the file
indicate that it is supposed to be used by user-level code. But the file
is not installed.
Install the headers and mark the unstable flags as out-of-bounds. The
page-type tool is also adjusted to not duplicate the definitions
Signed-off-by: Ulrich Drepper <drepper@gmail.com>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/Kbuild | 1 | ||||
-rw-r--r-- | include/linux/kernel-page-flags.h | 4 | ||||
-rw-r--r-- | tools/vm/page-types.c | 28 |
3 files changed, 6 insertions, 27 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 4cd59b95858f..7185b8f15ced 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
@@ -225,6 +225,7 @@ header-y += kd.h | |||
225 | header-y += kdev_t.h | 225 | header-y += kdev_t.h |
226 | header-y += kernel.h | 226 | header-y += kernel.h |
227 | header-y += kernelcapi.h | 227 | header-y += kernelcapi.h |
228 | header-y += kernel-page-flags.h | ||
228 | header-y += keyboard.h | 229 | header-y += keyboard.h |
229 | header-y += keyctl.h | 230 | header-y += keyctl.h |
230 | header-y += l2tp.h | 231 | header-y += l2tp.h |
diff --git a/include/linux/kernel-page-flags.h b/include/linux/kernel-page-flags.h index 26a65711676f..a1bdf6966357 100644 --- a/include/linux/kernel-page-flags.h +++ b/include/linux/kernel-page-flags.h | |||
@@ -32,6 +32,8 @@ | |||
32 | #define KPF_KSM 21 | 32 | #define KPF_KSM 21 |
33 | #define KPF_THP 22 | 33 | #define KPF_THP 22 |
34 | 34 | ||
35 | #ifdef __KERNEL__ | ||
36 | |||
35 | /* kernel hacking assistances | 37 | /* kernel hacking assistances |
36 | * WARNING: subject to change, never rely on them! | 38 | * WARNING: subject to change, never rely on them! |
37 | */ | 39 | */ |
@@ -44,4 +46,6 @@ | |||
44 | #define KPF_ARCH 38 | 46 | #define KPF_ARCH 38 |
45 | #define KPF_UNCACHED 39 | 47 | #define KPF_UNCACHED 39 |
46 | 48 | ||
49 | #endif /* __KERNEL__ */ | ||
50 | |||
47 | #endif /* LINUX_KERNEL_PAGE_FLAGS_H */ | 51 | #endif /* LINUX_KERNEL_PAGE_FLAGS_H */ |
diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c index 7dab7b25b5c6..f77c96bec7eb 100644 --- a/tools/vm/page-types.c +++ b/tools/vm/page-types.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <sys/mount.h> | 35 | #include <sys/mount.h> |
36 | #include <sys/statfs.h> | 36 | #include <sys/statfs.h> |
37 | #include "../../include/linux/magic.h" | 37 | #include "../../include/linux/magic.h" |
38 | #include "../../include/linux/kernel-page-flags.h" | ||
38 | 39 | ||
39 | 40 | ||
40 | #ifndef MAX_PATH | 41 | #ifndef MAX_PATH |
@@ -73,33 +74,6 @@ | |||
73 | #define KPF_BYTES 8 | 74 | #define KPF_BYTES 8 |
74 | #define PROC_KPAGEFLAGS "/proc/kpageflags" | 75 | #define PROC_KPAGEFLAGS "/proc/kpageflags" |
75 | 76 | ||
76 | /* copied from kpageflags_read() */ | ||
77 | #define KPF_LOCKED 0 | ||
78 | #define KPF_ERROR 1 | ||
79 | #define KPF_REFERENCED 2 | ||
80 | #define KPF_UPTODATE 3 | ||
81 | #define KPF_DIRTY 4 | ||
82 | #define KPF_LRU 5 | ||
83 | #define KPF_ACTIVE 6 | ||
84 | #define KPF_SLAB 7 | ||
85 | #define KPF_WRITEBACK 8 | ||
86 | #define KPF_RECLAIM 9 | ||
87 | #define KPF_BUDDY 10 | ||
88 | |||
89 | /* [11-20] new additions in 2.6.31 */ | ||
90 | #define KPF_MMAP 11 | ||
91 | #define KPF_ANON 12 | ||
92 | #define KPF_SWAPCACHE 13 | ||
93 | #define KPF_SWAPBACKED 14 | ||
94 | #define KPF_COMPOUND_HEAD 15 | ||
95 | #define KPF_COMPOUND_TAIL 16 | ||
96 | #define KPF_HUGE 17 | ||
97 | #define KPF_UNEVICTABLE 18 | ||
98 | #define KPF_HWPOISON 19 | ||
99 | #define KPF_NOPAGE 20 | ||
100 | #define KPF_KSM 21 | ||
101 | #define KPF_THP 22 | ||
102 | |||
103 | /* [32-] kernel hacking assistances */ | 77 | /* [32-] kernel hacking assistances */ |
104 | #define KPF_RESERVED 32 | 78 | #define KPF_RESERVED 32 |
105 | #define KPF_MLOCKED 33 | 79 | #define KPF_MLOCKED 33 |