summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Hansen <dave@linux.vnet.ibm.com>2011-05-24 17:11:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 08:39:11 -0700
commit82d4b5779a75887750748609f3415f01c1bb9f81 (patch)
tree44e467cea2a2fbf88325b6a562c2efa39f53b9d2
parent15fa8f425557a0d698f933627771f520ef4ae34b (diff)
include/linux/gfp.h: convert BUG_ON() into VM_BUG_ON()
VM_BUG_ON() if effectively a BUG_ON() undef #ifdef CONFIG_DEBUG_VM. That is exactly what we have here now, and two different folks have suggested doing it this way. Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com> Cc: Christoph Lameter <cl@linux.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/gfp.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 7e8f5d863c76..cb4089254f01 100644
--- a/include/linux/gfp.h
+++ b/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;
}