Re: [PATCH 4/5 ver2] rt2x00: Compiler warning unmasked by fix of BUILD_BUG_ON

From: Ivo van Doorn
Date: Tue Sep 02 2008 - 10:28:06 EST


> From: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
> Date: Mon, 1 Sep 2008 14:47:19 +0300
> Subject: [PATCH] rt2x00: Compiler warning unmasked by fix of BUILD_BUG_ON
>
> A "Set" to a sign-bit in an "&" operation causes a compiler warning.
> Make calculations unsigned.
>
> [ The warning was masked by the old definition of BUILD_BUG_ON() ]
>
> Also remove __builtin_constant_p from FIELD_CHECK since BUILD_BUG_ON
> no longer permits non-const values.
>
> Signed-off-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
> TO: Ivo van Doorn <IvDoorn@xxxxxxxxx>
> TO: John W. Linville <linville@xxxxxxxxxxxxx>
> CC: Ingo Molnar <mingo@xxxxxxx>
> CC: Rusty Russell <rusty@xxxxxxxxxxxxxxx>

Thanks.

Acked-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>

> ---
> drivers/net/wireless/rt2x00/rt2x00reg.h | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/rt2x00/rt2x00reg.h
> index 7e88ce5..2ea7866 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00reg.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00reg.h
> @@ -136,7 +136,7 @@ struct rt2x00_field32 {
> */
> #define is_power_of_two(x) ( !((x) & ((x)-1)) )
> #define low_bit_mask(x) ( ((x)-1) & ~(x) )
> -#define is_valid_mask(x) is_power_of_two(1 + (x) + low_bit_mask(x))
> +#define is_valid_mask(x) is_power_of_two(1LU + (x) + low_bit_mask(x))
>
> /*
> * Macro's to find first set bit in a variable.
> @@ -173,8 +173,7 @@ struct rt2x00_field32 {
> * does not exceed the given typelimit.
> */
> #define FIELD_CHECK(__mask, __type) \
> - BUILD_BUG_ON(!__builtin_constant_p(__mask) || \
> - !(__mask) || \
> + BUILD_BUG_ON(!(__mask) || \
> !is_valid_mask(__mask) || \
> (__mask) != (__type)(__mask)) \
>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/