lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove MAYBE_BUILD_BUG_ON

Browse Source 
Now BUILD_BUG_ON() can handle optimizable constants, we don't need
MAYBE_BUILD_BUG_ON any more.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2011-01-24 14:45:10 -06:00
parent 7ef88ad561
commit 1765e3a493
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/gfp.h
View File

@@ -249,7 +249,7 @@ static inline enum zone_type gfp_zone(gfp_t flags)
((1 << ZONES_SHIFT) - 1); ((1 << ZONES_SHIFT) - 1);
if (__builtin_constant_p(bit)) if (__builtin_constant_p(bit))
MAYBE_BUILD_BUG_ON((GFP_ZONE_BAD >> bit) & 1); BUILD_BUG_ON((GFP_ZONE_BAD >> bit) & 1);
else { else {
#ifdef CONFIG_DEBUG_VM #ifdef CONFIG_DEBUG_VM
BUG_ON((GFP_ZONE_BAD >> bit) & 1); BUG_ON((GFP_ZONE_BAD >> bit) & 1);

1
include/linux/kernel.h
View File

@@ -611,7 +611,6 @@ extern int __build_bug_on_failed;
if (condition) __build_bug_on_failed = 1; \ if (condition) __build_bug_on_failed = 1; \
} while(0) } while(0)
#endif #endif
#define MAYBE_BUILD_BUG_ON(condition) BUILD_BUG_ON(condition)
/* Trap pasters of __FUNCTION__ at compile-time */ /* Trap pasters of __FUNCTION__ at compile-time */
#define __FUNCTION__ (__func__) #define __FUNCTION__ (__func__)

2
include/linux/kmemcheck.h
View File

@@ -76,7 +76,7 @@ bool kmemcheck_is_obj_initialized(unsigned long addr, size_t size);
\ \
_n = (long) &((ptr)->name##_end) \ _n = (long) &((ptr)->name##_end) \
- (long) &((ptr)->name##_begin); \ - (long) &((ptr)->name##_begin); \
MAYBE_BUILD_BUG_ON(_n < 0); \ BUILD_BUG_ON(_n < 0); \
\ \
kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \ kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \
} while (0) } while (0)

5
include/linux/virtio_config.h
View File

@@ -109,7 +109,10 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev,
unsigned int fbit) unsigned int fbit)
{ {
/* Did you forget to fix assumptions on max features? */ /* Did you forget to fix assumptions on max features? */
MAYBE_BUILD_BUG_ON(fbit >= 32); if (__builtin_constant_p(fbit))
BUILD_BUG_ON(fbit >= 32);
else
BUG_ON(fbit >= 32);
if (fbit < VIRTIO_TRANSPORT_F_START) if (fbit < VIRTIO_TRANSPORT_F_START)
virtio_check_driver_offered_feature(vdev, fbit); virtio_check_driver_offered_feature(vdev, fbit);