perf env: Remove env.h from other headers where just a fwd decl is needed
The following commit has been merged into the perf/core branch of tip:
Commit-ID: b6b5574b80d6ce6ca87ae3ea1e97cff1bf730f2e Gitweb: https://git.kernel.org/tip/b6b5574b80d6ce6ca87ae3ea1e97cff1bf730f2e Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 29 Aug 2019 17:10:59 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Sat, 31 Aug 2019 19:10:40 -03:00
perf env: Remove env.h from other headers where just a fwd decl is needed
And fixup the fallout of c files not building due to now missing headers.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/arch/common.h | 4 +++- tools/perf/tests/mem2node.c | 2 ++ tools/perf/util/cputopo.h | 1 - tools/perf/util/mem2node.c | 2 ++ tools/perf/util/mem2node.h | 3 ++- 5 files changed, 9 insertions(+), 3 deletions(-)
tools/perf/arch/common.h +3 -1
@@ -2,7 +2,9 @@#ifndef ARCH_PERF_COMMON_H #define ARCH_PERF_COMMON_H -#include "../util/env.h" +#include <stdbool.h> + +struct perf_env ;int perf_env__lookup_objdump (struct perf_env *env,const char **path);bool perf_env__single_address_space (struct perf_env *env);
tools/perf/tests/mem2node.c +2 -0
@@ -1,10 +1,12 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> #include <linux/bitmap.h> +#include <linux/kernel.h> #include <linux/zalloc.h> #include <perf/cpumap.h> #include "cpumap.h" #include "debug.h" +#include "env.h" #include "mem2node.h" #include "tests.h"
tools/perf/util/cputopo.h +0 -1
@@ -3,7 +3,6 @@#define __PERF_CPUTOPO_H#include <linux/types.h> -#include "env.h" struct cpu_topology {u32 core_sib;
tools/perf/util/mem2node.c +2 -0
@@ -1,8 +1,10 @@#include <errno.h> #include <inttypes.h> #include <linux/bitmap.h> +#include <linux/kernel.h> #include <linux/zalloc.h> #include "debug.h" +#include "env.h" #include "mem2node.h" struct phys_entry {
tools/perf/util/mem2node.h +2 -1
@@ -2,8 +2,9 @@#define __MEM2NODE_H#include <linux/rbtree.h> -#include "env.h" +#include <linux/types.h> +struct perf_env ;struct phys_entry ;struct mem2node {