diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /include/linux/gfp.h | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'include/linux/gfp.h')
| -rw-r--r-- | include/linux/gfp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index a3b148a9187..0b84c61607e 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h | |||
| @@ -249,7 +249,7 @@ static inline enum zone_type gfp_zone(gfp_t flags) | |||
| 249 | ((1 << ZONES_SHIFT) - 1); | 249 | ((1 << ZONES_SHIFT) - 1); |
| 250 | 250 | ||
| 251 | if (__builtin_constant_p(bit)) | 251 | if (__builtin_constant_p(bit)) |
| 252 | MAYBE_BUILD_BUG_ON((GFP_ZONE_BAD >> bit) & 1); | 252 | BUILD_BUG_ON((GFP_ZONE_BAD >> bit) & 1); |
| 253 | else { | 253 | else { |
| 254 | #ifdef CONFIG_DEBUG_VM | 254 | #ifdef CONFIG_DEBUG_VM |
| 255 | BUG_ON((GFP_ZONE_BAD >> bit) & 1); | 255 | BUG_ON((GFP_ZONE_BAD >> bit) & 1); |