include/linux/gfp.h: convert BUG_ON() into VM_BUG_ON()
authorDave Hansen <dave@linux.vnet.ibm.com>
Wed, 25 May 2011 00:11:42 +0000 (17:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2011 15:39:11 +0000 (08:39 -0700)
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>
include/linux/gfp.h

index 7e8f5d8..cb40892 100644 (file)
@@ -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;
 }