Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/include/linux/poison.h b/include/linux/poison.h
index 3e628f990fdf..95f518b17684 100644
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -18,6 +18,9 @@
 #define RED_INACTIVE    0x5A2CF071UL    /* when obj is inactive */
 #define RED_ACTIVE      0x170FC2A5UL    /* 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 */
 #define POISON_FREE     0x6b    /* for use-after-free poisoning */
@@ -26,9 +29,6 @@
 /********** arch/$ARCH/mm/init.c **********/
 #define POISON_FREE_INITMEM     0xcc
 
-/********** arch/x86_64/mm/init.c **********/
-#define POISON_FREE_INITDATA    0xba
-
 /********** arch/ia64/hp/common/sba_iommu.c **********/
 /*
  * arch/ia64/hp/common/sba_iommu.c uses a 16-byte poison string with a