Commit 1765e3a4 authored by Rusty Russell's avatar Rusty Russell
Browse files

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: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 7ef88ad5

include/linux/gfp.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/kernel.h

+0 −1
Original line number Diff line number Diff line
@@ -611,7 +611,6 @@ extern int __build_bug_on_failed; 
		if (condition) __build_bug_on_failed = 1;	\

	} while(0)

#endif

#define MAYBE_BUILD_BUG_ON(condition) BUILD_BUG_ON(condition)



/* Trap pasters of __FUNCTION__ at compile-time */

#define __FUNCTION__ (__func__)

include/linux/kmemcheck.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ bool kmemcheck_is_obj_initialized(unsigned long addr, size_t size); 
									\

		_n = (long) &((ptr)->name##_end)			\

			- (long) &((ptr)->name##_begin);		\

		MAYBE_BUILD_BUG_ON(_n < 0);				\

		BUILD_BUG_ON(_n < 0);					\

									\

		kmemcheck_mark_initialized(&((ptr)->name##_begin), _n);	\

	} while (0)

include/linux/virtio_config.h

+4 −1
Original line number Diff line number Diff line
@@ -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);