[PATCH v9 02/23] perf arch x86: Sort includes and add missed explicit dependencies

[Namhyung Kim]

On Fri, May 22, 2026 at 03:04:13PM -0700, Ian Rogers wrote:
> Fix missing #includes found while cleaning the evsel/evlist header
> files. Sort the remaining header files for consistency with the rest
> of the code.
> 
> Signed-off-by: Ian Rogers <irogers at google.com>

Acked-by: Namhyung Kim <namhyung at kernel.org>

Thanks,
Namhyung

> ---
>  tools/perf/arch/x86/util/intel-bts.c | 20 +++++++++++--------
>  tools/perf/arch/x86/util/intel-pt.c  | 29 +++++++++++++++-------------
>  2 files changed, 28 insertions(+), 21 deletions(-)
> 
> diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c
> index 85c8186300c8..100a23d27998 100644
> --- a/tools/perf/arch/x86/util/intel-bts.c
> +++ b/tools/perf/arch/x86/util/intel-bts.c
> @@ -4,26 +4,30 @@
>   * Copyright (c) 2013-2015, Intel Corporation.
>   */
>  
> +#include "../../../util/intel-bts.h"
> +
>  #include <errno.h>
> -#include <linux/kernel.h>
> -#include <linux/types.h>
> +
>  #include <linux/bitops.h>
> +#include <linux/kernel.h>
>  #include <linux/log2.h>
> +#include <linux/types.h>
>  #include <linux/zalloc.h>
>  
> +#include <internal/lib.h> // page_size
> +
> +#include "../../../util/auxtrace.h"
>  #include "../../../util/cpumap.h"
> +#include "../../../util/debug.h"
>  #include "../../../util/event.h"
> -#include "../../../util/evsel.h"
>  #include "../../../util/evlist.h"
> +#include "../../../util/evsel.h"
>  #include "../../../util/mmap.h"
> -#include "../../../util/session.h"
> +#include "../../../util/pmu.h"
>  #include "../../../util/pmus.h"
> -#include "../../../util/debug.h"
>  #include "../../../util/record.h"
> +#include "../../../util/session.h"
>  #include "../../../util/tsc.h"
> -#include "../../../util/auxtrace.h"
> -#include "../../../util/intel-bts.h"
> -#include <internal/lib.h> // page_size
>  
>  #define KiB(x) ((x) * 1024)
>  #define MiB(x) ((x) * 1024 * 1024)
> diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
> index c131a727774f..0307ff15d9fc 100644
> --- a/tools/perf/arch/x86/util/intel-pt.c
> +++ b/tools/perf/arch/x86/util/intel-pt.c
> @@ -3,36 +3,39 @@
>   * intel_pt.c: Intel Processor Trace support
>   * Copyright (c) 2013-2015, Intel Corporation.
>   */
> +#include "../../../util/intel-pt.h"
>  
>  #include <errno.h>
>  #include <stdbool.h>
> -#include <linux/kernel.h>
> -#include <linux/types.h>
> +
>  #include <linux/bitops.h>
> +#include <linux/err.h>
> +#include <linux/kernel.h>
>  #include <linux/log2.h>
> +#include <linux/types.h>
>  #include <linux/zalloc.h>
> -#include <linux/err.h>
>  
> -#include "../../../util/session.h"
> +#include <api/fs/fs.h>
> +#include <internal/lib.h> // page_size
> +#include <subcmd/parse-options.h>
> +
> +#include "../../../util/auxtrace.h"
> +#include "../../../util/config.h"
> +#include "../../../util/cpumap.h"
> +#include "../../../util/debug.h"
>  #include "../../../util/event.h"
>  #include "../../../util/evlist.h"
>  #include "../../../util/evsel.h"
>  #include "../../../util/evsel_config.h"
> -#include "../../../util/config.h"
> -#include "../../../util/cpumap.h"
>  #include "../../../util/mmap.h"
> -#include <subcmd/parse-options.h>
>  #include "../../../util/parse-events.h"
> -#include "../../../util/pmus.h"
> -#include "../../../util/debug.h"
> -#include "../../../util/auxtrace.h"
>  #include "../../../util/perf_api_probe.h"
> +#include "../../../util/pmu.h"
> +#include "../../../util/pmus.h"
>  #include "../../../util/record.h"
> +#include "../../../util/session.h"
>  #include "../../../util/target.h"
>  #include "../../../util/tsc.h"
> -#include <internal/lib.h> // page_size
> -#include "../../../util/intel-pt.h"
> -#include <api/fs/fs.h>
>  #include "cpuid.h"
>  
>  #define KiB(x) ((x) * 1024)
> -- 
> 2.54.0.794.g4f17f83d09-goog
>