From: Dave Hansen Date: Wed, 25 May 2011 00:11:42 +0000 (-0700) Subject: include/linux/gfp.h: convert BUG_ON() into VM_BUG_ON() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=82d4b5779a75887750748609f3415f01c1bb9f81;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 7e8f5d863c7..cb4089254f0 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; }