Re: [PATCH v5 1/6] perf: cs-etm: Don't duplicate FIELD_GET()

[Arnaldo Carvalho de Melo]

Em Fri, Aug 11, 2023 at 03:39:18PM +0100, James Clark escreveu:
> linux/bitfield.h can be included as long as linux/kernel.h is included
> first, so change the order of the includes and drop the duplicate macro.

Applied this one, to reduce the patch series size.

- Arnaldo
 
> Reviewed-by: John Garry <john.g.garry@xxxxxxxxxx>
> Signed-off-by: James Clark <james.clark@xxxxxxx>
> ---
>  tools/perf/util/cs-etm.c | 14 ++------------
>  1 file changed, 2 insertions(+), 12 deletions(-)
> 
> diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
> index 1419b40dfbe8..9729d006550d 100644
> --- a/tools/perf/util/cs-etm.c
> +++ b/tools/perf/util/cs-etm.c
> @@ -6,10 +6,11 @@
>   * Author: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
>   */
>  
> +#include <linux/kernel.h>
> +#include <linux/bitfield.h>
>  #include <linux/bitops.h>
>  #include <linux/coresight-pmu.h>
>  #include <linux/err.h>
> -#include <linux/kernel.h>
>  #include <linux/log2.h>
>  #include <linux/types.h>
>  #include <linux/zalloc.h>
> @@ -281,17 +282,6 @@ static int cs_etm__metadata_set_trace_id(u8 trace_chan_id, u64 *cpu_metadata)
>  	return 0;
>  }
>  
> -/*
> - * FIELD_GET (linux/bitfield.h) not available outside kernel code,
> - * and the header contains too many dependencies to just copy over,
> - * so roll our own based on the original
> - */
> -#define __bf_shf(x) (__builtin_ffsll(x) - 1)
> -#define FIELD_GET(_mask, _reg)						\
> -	({								\
> -		(typeof(_mask))(((_reg) & (_mask)) >> __bf_shf(_mask)); \
> -	})
> -
>  /*
>   * Get a metadata for a specific cpu from an array.
>   *
> -- 
> 2.34.1
> 

-- 

- Arnaldo