On 29/09/2020 14:39, Leo Yan wrote:
> Include header linux/bitops.h, directly use its BIT() macro and remove
> the self defined macros.
>
> Signed-off-by: Leo Yan <leo....@linaro.org>
Reviewed-by: Andre Przywara <andre.przyw...@arm.com>
Thanks,
Andre
> ---
> tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 5 +----
> tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 3 +--
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-decoder.c
> b/tools/perf/util/arm-spe-decoder/arm-spe-decoder.c
> index 93e063f22be5..cc18a1e8c212 100644
> --- a/tools/perf/util/arm-spe-decoder/arm-spe-decoder.c
> +++ b/tools/perf/util/arm-spe-decoder/arm-spe-decoder.c
> @@ -12,6 +12,7 @@
> #include <string.h>
> #include <stdint.h>
> #include <stdlib.h>
> +#include <linux/bitops.h>
> #include <linux/compiler.h>
> #include <linux/zalloc.h>
>
> @@ -21,10 +22,6 @@
>
> #include "arm-spe-decoder.h"
>
> -#ifndef BIT
> -#define BIT(n) (1UL << (n))
> -#endif
> -
> static u64 arm_spe_calc_ip(int index, u64 payload)
> {
> u8 *addr = (u8 *)&payload;
> diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
> b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
> index b94001b756c7..46ddb53a6457 100644
> --- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
> +++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
> @@ -8,11 +8,10 @@
> #include <string.h>
> #include <endian.h>
> #include <byteswap.h>
> +#include <linux/bitops.h>
>
> #include "arm-spe-pkt-decoder.h"
>
> -#define BIT(n) (1ULL << (n))
> -
> #define NS_FLAG BIT(63)
> #define EL_FLAG (BIT(62) | BIT(61))
>
>
