Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6-omap-h63xx.git] / include / linux / poison.h

diff --git a/include/linux/poison.h b/include/linux/poison.h
index 89580b76495970387a1ead74a068762ac2178345..a9c31be7052c4bcbd4593963ebf32303b338e04f 100644 (file)
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -15,8 +15,11 @@
  * Magic nums for obj red zoning.
  * Placed in the first word before and the first word after an obj.
  */
-#define        RED_INACTIVE    0x5A2CF071UL    /* when obj is inactive */
-#define        RED_ACTIVE      0x170FC2A5UL    /* when obj is active */
+#define        RED_INACTIVE    0x09F911029D74E35BULL   /* when obj is inactive */
+#define        RED_ACTIVE      0xD84156C5635688C0ULL   /* when obj is active */
+
+#define SLUB_RED_INACTIVE      0xbb
+#define SLUB_RED_ACTIVE                0xcc
 
 /* ...and for poisoning */
 #define        POISON_INUSE    0x5a    /* for use-uninitialised poisoning */
@@ -33,7 +36,8 @@
  */
 
 /********** fs/jbd/journal.c **********/
-#define JBD_POISON_FREE        0x5b
+#define JBD_POISON_FREE                0x5b
+#define JBD2_POISON_FREE       0x5c
 
 /********** drivers/base/dmapool.c **********/
 #define        POOL_POISON_FREED       0xa7    /* !inuse */