2019-03-27 17:08:49

by Jagadeesh Pagadala

Subject: [PATCH] tools/perf/util: Remove duplicate headers

From: Jagadeesh Pagadala <[email protected]>

Remove duplicate headers which are included twice.

Signed-off-by: Jagadeesh Pagadala <[email protected]>
---
tools/perf/util/annotate.c | 1 -
tools/perf/util/data.c | 1 -
tools/perf/util/get_current_dir_name.c | 1 -
tools/perf/util/stat-display.c | 1 -
4 files changed, 4 deletions(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index c8b0117..b1dd021 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -36,7 +36,6 @@
#include <pthread.h>
#include <linux/bitops.h>
#include <linux/kernel.h>
-#include <bpf/libbpf.h>

/* FIXME: For the HE_COLORSET */
#include "ui/browser.h"
diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
index 6a64f71..509a41e 100644
--- a/tools/perf/util/data.c
+++ b/tools/perf/util/data.c
@@ -8,7 +8,6 @@
#include <unistd.h>
#include <string.h>
#include <asm/bug.h>
-#include <sys/types.h>
#include <dirent.h>

#include "data.h"
diff --git a/tools/perf/util/get_current_dir_name.c b/tools/perf/util/get_current_dir_name.c
index 267aa60..ebb80cd 100644
--- a/tools/perf/util/get_current_dir_name.c
+++ b/tools/perf/util/get_current_dir_name.c
@@ -5,7 +5,6 @@
#include "util.h"
#include <unistd.h>
#include <stdlib.h>
-#include <stdlib.h>

/* Android's 'bionic' library, for one, doesn't have this */

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 6d043c7..7b3a16c 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -12,7 +12,6 @@
#include "string2.h"
#include "sane_ctype.h"
#include "cgroup.h"
-#include <math.h>
#include <api/fs/fs.h>

#define CNTR_NOT_SUPPORTED "<not supported>"
--
1.8.3.1

2019-03-28 06:28:12

by Mukesh Ojha

Subject: Re: [PATCH] tools/perf/util: Remove duplicate headers

On 3/28/2019 3:37 AM, [email protected] wrote:
> From: Jagadeesh Pagadala <[email protected]>
>
> Remove duplicate headers which are included twice.
> Signed-off-by: Jagadeesh Pagadala <[email protected]>

Reviewed-by: Mukesh Ojha <[email protected]>

-Mukesh

> ---
> tools/perf/util/annotate.c | 1 -
> tools/perf/util/data.c | 1 -
> tools/perf/util/get_current_dir_name.c | 1 -
> tools/perf/util/stat-display.c | 1 -
> 4 files changed, 4 deletions(-)
>
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index c8b0117..b1dd021 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -36,7 +36,6 @@
> #include <pthread.h>
> #include <linux/bitops.h>
> #include <linux/kernel.h>
> -#include <bpf/libbpf.h>
>
> /* FIXME: For the HE_COLORSET */
> #include "ui/browser.h"
> diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
> index 6a64f71..509a41e 100644
> --- a/tools/perf/util/data.c
> +++ b/tools/perf/util/data.c
> @@ -8,7 +8,6 @@
> #include <unistd.h>
> #include <string.h>
> #include <asm/bug.h>
> -#include <sys/types.h>
> #include <dirent.h>
>
> #include "data.h"
> diff --git a/tools/perf/util/get_current_dir_name.c b/tools/perf/util/get_current_dir_name.c
> index 267aa60..ebb80cd 100644
> --- a/tools/perf/util/get_current_dir_name.c
> +++ b/tools/perf/util/get_current_dir_name.c
> @@ -5,7 +5,6 @@
> #include "util.h"
> #include <unistd.h>
> #include <stdlib.h>
> -#include <stdlib.h>
>
> /* Android's 'bionic' library, for one, doesn't have this */
>
> diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
> index 6d043c7..7b3a16c 100644
> --- a/tools/perf/util/stat-display.c
> +++ b/tools/perf/util/stat-display.c
> @@ -12,7 +12,6 @@
> #include "string2.h"
> #include "sane_ctype.h"
> #include "cgroup.h"
> -#include <math.h>
> #include <api/fs/fs.h>
>
> #define CNTR_NOT_SUPPORTED "<not supported>"