---

yaml --- r: 250879 b: refs/heads/master c: 82d4b57 h: refs/heads/master i: 250877: 9217f6d 250875: a40ad80 250871: c2d659b 250863: 42ff1ce 250847: 06c80fa 250815: f014aeb 250751: 13c6f3c 250623: 9d83f4b 250367: e7aa425 249855: 097017c v: v3
git-mirror · May 25, 2011 · 8f06f45 · 8f06f45
1 parent b033498
commit 8f06f45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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;
 }