Re: [PATCH 31/45] tools/perf: remove duplicate includes

[Arnaldo Carvalho de Melo]

Em Wed, Dec 06, 2017 at 11:13:24PM +0530, Pravin Shedge escreveu:
> These duplicate includes have been found with scripts/checkincludes.pl but
> they have been removed manually to avoid removing false positives.

Thanks, checked the dups manually too and applied,

- Arnaldo
 
> Signed-off-by: Pravin Shedge <pravin.shedge4linux@xxxxxxxxx>
> ---
>  tools/perf/bench/futex-hash.c                          | 1 -
>  tools/perf/builtin-c2c.c                               | 3 ---
>  tools/perf/builtin-record.c                            | 1 -
>  tools/perf/builtin-stat.c                              | 1 -
>  tools/perf/tests/parse-events.c                        | 1 -
>  tools/perf/util/auxtrace.c                             | 3 ---
>  tools/perf/util/header.c                               | 2 --
>  tools/perf/util/metricgroup.c                          | 2 --
>  tools/perf/util/scripting-engines/trace-event-python.c | 1 -
>  9 files changed, 15 deletions(-)
> 
> diff --git a/tools/perf/bench/futex-hash.c b/tools/perf/bench/futex-hash.c
> index 58ae6ed..4a3c1df 100644
> --- a/tools/perf/bench/futex-hash.c
> +++ b/tools/perf/bench/futex-hash.c
> @@ -26,7 +26,6 @@
>  #include "futex.h"
>  
>  #include <err.h>
> -#include <sys/time.h>
>  
>  static unsigned int nthreads = 0;
>  static unsigned int nsecs    = 10;
> diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
> index 17855c4..54d2cec 100644
> --- a/tools/perf/builtin-c2c.c
> +++ b/tools/perf/builtin-c2c.c
> @@ -27,13 +27,10 @@
>  #include "sort.h"
>  #include "tool.h"
>  #include "data.h"
> -#include "sort.h"
>  #include "event.h"
>  #include "evlist.h"
>  #include "evsel.h"
> -#include <asm/bug.h>
>  #include "ui/browsers/hists.h"
> -#include "evlist.h"
>  #include "thread.h"
>  
>  struct c2c_hists {
> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
> index 3d7f33e..93ef455 100644
> --- a/tools/perf/builtin-record.c
> +++ b/tools/perf/builtin-record.c
> @@ -51,7 +51,6 @@
>  #include <signal.h>
>  #include <sys/mman.h>
>  #include <sys/wait.h>
> -#include <asm/bug.h>
>  #include <linux/time64.h>
>  
>  struct switch_output {
> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
> index 59af5a8..1d9af8a 100644
> --- a/tools/perf/builtin-stat.c
> +++ b/tools/perf/builtin-stat.c
> @@ -63,7 +63,6 @@
>  #include "util/group.h"
>  #include "util/session.h"
>  #include "util/tool.h"
> -#include "util/group.h"
>  #include "util/string2.h"
>  #include "util/metricgroup.h"
>  #include "asm/bug.h"
> diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
> index f067961..18b0644 100644
> --- a/tools/perf/tests/parse-events.c
> +++ b/tools/perf/tests/parse-events.c
> @@ -13,7 +13,6 @@
>  #include <unistd.h>
>  #include <linux/kernel.h>
>  #include <linux/hw_breakpoint.h>
> -#include <api/fs/fs.h>
>  #include <api/fs/tracing_path.h>
>  
>  #define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \
> diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
> index a3349141..c76687e 100644
> --- a/tools/perf/util/auxtrace.c
> +++ b/tools/perf/util/auxtrace.c
> @@ -31,9 +31,6 @@
>  #include <sys/param.h>
>  #include <stdlib.h>
>  #include <stdio.h>
> -#include <string.h>
> -#include <limits.h>
> -#include <errno.h>
>  #include <linux/list.h>
>  
>  #include "../perf.h"
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index 7c0e9d5..3e283b0 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -15,9 +15,7 @@
>  #include <linux/bitops.h>
>  #include <linux/stringify.h>
>  #include <sys/stat.h>
> -#include <sys/types.h>
>  #include <sys/utsname.h>
> -#include <unistd.h>
>  
>  #include "evlist.h"
>  #include "evsel.h"
> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
> index 0ddd9c1..699311d 100644
> --- a/tools/perf/util/metricgroup.c
> +++ b/tools/perf/util/metricgroup.c
> @@ -20,12 +20,10 @@
>  #include "pmu.h"
>  #include "expr.h"
>  #include "rblist.h"
> -#include "pmu.h"
>  #include <string.h>
>  #include <stdbool.h>
>  #include <errno.h>
>  #include "pmu-events/pmu-events.h"
> -#include "strbuf.h"
>  #include "strlist.h"
>  #include <assert.h>
>  #include <ctype.h>
> diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
> index c7187f0..c1848b5 100644
> --- a/tools/perf/util/scripting-engines/trace-event-python.c
> +++ b/tools/perf/util/scripting-engines/trace-event-python.c
> @@ -43,7 +43,6 @@
>  #include "../db-export.h"
>  #include "../thread-stack.h"
>  #include "../trace-event.h"
> -#include "../machine.h"
>  #include "../call-path.h"
>  #include "thread_map.h"
>  #include "cpumap.h"
> -- 
> 2.7.4