projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-next
[cascardo/linux.git]
/
include
/
linux
/
gfp.h
diff --git
a/include/linux/gfp.h
b/include/linux/gfp.h
index
7e8f5d8
..
cb40892
100644
(file)
--- 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;
}