summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@akkadia.org>2012-05-29 15:06:30 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-10 00:36:11 +0900
commit08c372db1aa0a65e0b2135e8556be35e1175f9b9 (patch)
tree9b96ee54557aaeba2d6d34b0b1ec457484dcc44f /include/linux
parente552a3bfe0c60c65d35cc3ee6a5f20d9702ebc9a (diff)
downloadlinux-3.10-08c372db1aa0a65e0b2135e8556be35e1175f9b9.tar.gz
linux-3.10-08c372db1aa0a65e0b2135e8556be35e1175f9b9.tar.bz2
linux-3.10-08c372db1aa0a65e0b2135e8556be35e1175f9b9.zip
kbuild: install kernel-page-flags.h
commit 9295b7a07c859a42346221b5839be0ae612333b0 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/Kbuild1
-rw-r--r--include/linux/kernel-page-flags.h4
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 3c9b616c834..50f55c77f8b 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -227,6 +227,7 @@ header-y += kd.h
header-y += kdev_t.h
header-y += kernel.h
header-y += kernelcapi.h
+header-y += kernel-page-flags.h
header-y += keyboard.h
header-y += keyctl.h
header-y += l2tp.h
diff --git a/include/linux/kernel-page-flags.h b/include/linux/kernel-page-flags.h
index 26a65711676..a1bdf696635 100644
--- a/include/linux/kernel-page-flags.h
+++ b/include/linux/kernel-page-flags.h
@@ -32,6 +32,8 @@
#define KPF_KSM 21
#define KPF_THP 22
+#ifdef __KERNEL__
+
/* kernel hacking assistances
* WARNING: subject to change, never rely on them!
*/
@@ -44,4 +46,6 @@
#define KPF_ARCH 38
#define KPF_UNCACHED 39
+#endif /* __KERNEL__ */
+
#endif /* LINUX_KERNEL_PAGE_FLAGS_H */