From e5e30ced91e5ca20d6cf4369d77385a941a9bed8 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 25 Jul 2011 17:12:18 -0700
Subject: [PATCH] --- yaml --- r: 258947 b: refs/heads/master c:
 c9d8c3d0896bfa5b57531ecc41a85ffbc6d87dbe h: refs/heads/master i:   258945:
 df047b2870112221f752751df19e1fad3b8a8ed8   258943:
 d7d5e59dbf2b9104d832349b72d8386bf96ac7ec v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/poison.h | 6 ++++++
 trunk/mm/memblock.c          | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8f447b48b031..cea6434007ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be8f684d73d8d916847e996bf69cef14352872c6
+refs/heads/master: c9d8c3d0896bfa5b57531ecc41a85ffbc6d87dbe
diff --git a/trunk/include/linux/poison.h b/trunk/include/linux/poison.h
index 2110a81c5e2a..79159de0e341 100644
--- a/trunk/include/linux/poison.h
+++ b/trunk/include/linux/poison.h
@@ -40,6 +40,12 @@
 #define	RED_INACTIVE	0x09F911029D74E35BULL	/* when obj is inactive */
 #define	RED_ACTIVE	0xD84156C5635688C0ULL	/* when obj is active */
 
+#ifdef CONFIG_PHYS_ADDR_T_64BIT
+#define MEMBLOCK_INACTIVE	0x3a84fb0144c9e71bULL
+#else
+#define MEMBLOCK_INACTIVE	0x44c9e71bUL
+#endif
+
 #define SLUB_RED_INACTIVE	0xbb
 #define SLUB_RED_ACTIVE		0xcc
 
diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c
index a0562d1a6ad4..ccbf97339592 100644
--- a/trunk/mm/memblock.c
+++ b/trunk/mm/memblock.c
@@ -758,9 +758,9 @@ void __init memblock_analyze(void)
 
 	/* Check marker in the unused last array entry */
 	WARN_ON(memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS].base
-		!= (phys_addr_t)RED_INACTIVE);
+		!= MEMBLOCK_INACTIVE);
 	WARN_ON(memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS].base
-		!= (phys_addr_t)RED_INACTIVE);
+		!= MEMBLOCK_INACTIVE);
 
 	memblock.memory_size = 0;
 
@@ -786,8 +786,8 @@ void __init memblock_init(void)
 	memblock.reserved.max	= INIT_MEMBLOCK_REGIONS;
 
 	/* Write a marker in the unused last array entry */
-	memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;
-	memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;
+	memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = MEMBLOCK_INACTIVE;
+	memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = MEMBLOCK_INACTIVE;
 
 	/* Create a dummy zero size MEMBLOCK which will get coalesced away later.
 	 * This simplifies the memblock_add() code below...