diff options
| author |   Rusty Russell <rusty@rustcorp.com.au> | 2011-01-24 14:45:10 -0600 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-01-24 14:45:11 +1030 |
| commit | 1765e3a4933ea0870fabd755feffc5473c4363ce (patch) | |
| tree | 208364f2933f96773310a3a6c4dce6a21f66eec7 /include/linux/virtio_config.h | |
| parent | BUILD_BUG_ON: make it handle more cases (diff) | |
| download | linux-dev-1765e3a4933ea0870fabd755feffc5473c4363ce.tar.xz linux-dev-1765e3a4933ea0870fabd755feffc5473c4363ce.zip | |
Remove MAYBE_BUILD_BUG_ON
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>
Diffstat (limited to 'include/linux/virtio_config.h')
| -rw-r--r-- | include/linux/virtio_config.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h index 0093dd7c1d6f..800617b4ddd5 100644 --- a/include/linux/virtio_config.h +++ b/include/linux/virtio_config.h @@ -109,7 +109,10 @@ static inline bool virtio_has_feature(const struct virtio_device *vdev, unsigned int fbit) { /* 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) virtio_check_driver_offered_feature(vdev, fbit); |