From 8f06f45f87f73e4995ebd5b68e21f11e9228bb60 Mon Sep 17 00:00:00 2001
From: Dave Hansen <dave@linux.vnet.ibm.com>
Date: Tue, 24 May 2011 17:11:42 -0700
Subject: [PATCH] --- yaml --- r: 250879 b: refs/heads/master c:
 82d4b5779a75887750748609f3415f01c1bb9f81 h: refs/heads/master i:   250877:
 9217f6db08e9a634a42265f5934dd1e38e8eca69   250875:
 a40ad80af3970faae6edf30da77a7e2eead4b2da   250871:
 c2d659bf38149cc2dd89463c722d6465644ac611   250863:
 42ff1ce5a412c780c07b95bc038a50ab9da67a77   250847:
 06c80fa749ab67363708b6a1c49f492680482e90   250815:
 f014aeba41a01727a3025fdac7207dfb4d604ad2   250751:
 13c6f3cb8b98225748a2b042d117bbd433630d07   250623:
 9d83f4bf008f5d9ee488c4b35f89dc7acd8030ee   250367:
 e7aa42553260ac18cf40b878b4f512968961f5ac   249855:
 097017c37626a2f13eefdb3620986e715018c5cb v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/gfp.h | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 60a7959efedd..965f766eec8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15fa8f425557a0d698f933627771f520ef4ae34b
+refs/heads/master: 82d4b5779a75887750748609f3415f01c1bb9f81
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index 7e8f5d863c76..cb4089254f01 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -249,9 +249,7 @@ static inline enum zone_type gfp_zone(gfp_t flags)
 
 	z = (GFP_ZONE_TABLE >> (bit * ZONES_SHIFT)) &
 					 ((1 << ZONES_SHIFT) - 1);
-#ifdef CONFIG_DEBUG_VM
-	BUG_ON((GFP_ZONE_BAD >> bit) & 1);
-#endif
+	VM_BUG_ON((GFP_ZONE_BAD >> bit) & 1);
 	return z;
 }