diff options
author | Steven Rostedt <srostedt@redhat.com> | 2010-05-14 15:29:52 +0200 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-14 15:29:52 +0200 |
commit | 23e117fa44429cc054cb27d5621d64e4ced91e52 (patch) | |
tree | a4b9d0902b9c6f009b2c297515221c1b9bed3af8 /include/linux/poison.h | |
parent | tracing: Fix "integer as NULL pointer" warning. (diff) | |
parent | sched, wait: Use wrapper functions (diff) | |
download | linux-23e117fa44429cc054cb27d5621d64e4ced91e52.tar.xz linux-23e117fa44429cc054cb27d5621d64e4ced91e52.zip |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-4
Diffstat (limited to 'include/linux/poison.h')
-rw-r--r-- | include/linux/poison.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/poison.h b/include/linux/poison.h index 2110a81c5e2a..34066ffd893d 100644 --- a/include/linux/poison.h +++ b/include/linux/poison.h @@ -48,6 +48,15 @@ #define POISON_FREE 0x6b /* for use-after-free poisoning */ #define POISON_END 0xa5 /* end-byte of poisoning */ +/********** mm/hugetlb.c **********/ +/* + * Private mappings of hugetlb pages use this poisoned value for + * page->mapping. The core VM should not be doing anything with this mapping + * but futex requires the existence of some page->mapping value even though it + * is unused if PAGE_MAPPING_ANON is set. + */ +#define HUGETLB_POISON ((void *)(0x00300300 + POISON_POINTER_DELTA + PAGE_MAPPING_ANON)) + /********** arch/$ARCH/mm/init.c **********/ #define POISON_FREE_INITMEM 0xcc |