summaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/mman.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 17:00:33 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 17:00:33 +0000
commit3d14b5beba35250c548d3851a2b84fce742d8311 (patch)
tree065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /arch/mips/include/asm/mman.h
parent0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff)
parent1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff)
downloadtalos-obmc-linux-3d14b5beba35250c548d3851a2b84fce742d8311.tar.gz
talos-obmc-linux-3d14b5beba35250c548d3851a2b84fce742d8311.zip
Merge branch 'sa1100' into devel
Diffstat (limited to 'arch/mips/include/asm/mman.h')
-rw-r--r--arch/mips/include/asm/mman.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mman.h b/arch/mips/include/asm/mman.h
index a2250f390a29..c892bfb3e2c1 100644
--- a/arch/mips/include/asm/mman.h
+++ b/arch/mips/include/asm/mman.h
@@ -75,6 +75,7 @@
#define MADV_MERGEABLE 12 /* KSM may merge identical pages */
#define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */
+#define MADV_HWPOISON 100 /* poison a page for testing */
/* compatibility flags */
#define MAP_FILE 0
OpenPOWER on IntegriCloud