diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-24 19:58:39 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-24 19:58:39 +1000 |
| commit | d315777b32a4696feb86f2a0c9e9f39c94683649 (patch) | |
| tree | f21c24d85cde6ad453c4d9485f5de49357336f81 /include/linux/gfp.h | |
| parent | 5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89 (diff) | |
| parent | 1765e3a4933ea0870fabd755feffc5473c4363ce (diff) | |
Merge branch 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
Remove MAYBE_BUILD_BUG_ON
BUILD_BUG_ON: make it handle more cases
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) ((1 << ZONES_SHIFT) - 1); if (__builtin_constant_p(bit)) - MAYBE_BUILD_BUG_ON((GFP_ZONE_BAD >> bit) & 1); + BUILD_BUG_ON((GFP_ZONE_BAD >> bit) & 1); else { #ifdef CONFIG_DEBUG_VM BUG_ON((GFP_ZONE_BAD >> bit) & 1); |