diff options
author | Borislav Petkov <bp@suse.de> | 2014-02-23 06:04:53 -0500 |
---|---|---|
committer | Jiri Olsa <jolsa@kernel.org> | 2014-05-01 15:18:17 -0400 |
commit | 5ac3e4b6d1d8fb911bb9c497126c51b02033a412 (patch) | |
tree | 9264ab483b4a304040ec091ae1d90a716f632d04 /tools/perf | |
parent | 3617660e4e1618a888a2e3a4067224534302cb33 (diff) |
tools: Unify export.h
So tools/ has been growing three, at a different stage of their
development export.h headers and so we should unite into one. Add
tools/include/ to the include path of virtio and liblockdep to pick the
shared header now.
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: virtio-dev@lists.oasis-open.org
Cc: virtualization@lists.linux-foundation.org
Link: http://lkml.kernel.org/r/1397493185-19521-2-git-send-email-bp@alien8.de
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/MANIFEST | 1 | ||||
-rw-r--r-- | tools/perf/Makefile.perf | 2 | ||||
-rw-r--r-- | tools/perf/util/include/linux/export.h | 6 |
3 files changed, 2 insertions, 7 deletions
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index c0c87c87b60f..81783c2037fc 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST | |||
@@ -7,6 +7,7 @@ tools/lib/symbol/kallsyms.h | |||
7 | tools/include/asm/bug.h | 7 | tools/include/asm/bug.h |
8 | tools/include/linux/compiler.h | 8 | tools/include/linux/compiler.h |
9 | tools/include/linux/hash.h | 9 | tools/include/linux/hash.h |
10 | tools/include/linux/export.h | ||
10 | include/linux/const.h | 11 | include/linux/const.h |
11 | include/linux/perf_event.h | 12 | include/linux/perf_event.h |
12 | include/linux/rbtree.h | 13 | include/linux/rbtree.h |
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 5e21aad44142..bd11e8a36422 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf | |||
@@ -222,7 +222,7 @@ LIB_H += util/include/linux/const.h | |||
222 | LIB_H += util/include/linux/ctype.h | 222 | LIB_H += util/include/linux/ctype.h |
223 | LIB_H += util/include/linux/kernel.h | 223 | LIB_H += util/include/linux/kernel.h |
224 | LIB_H += util/include/linux/list.h | 224 | LIB_H += util/include/linux/list.h |
225 | LIB_H += util/include/linux/export.h | 225 | LIB_H += ../include/linux/export.h |
226 | LIB_H += util/include/linux/poison.h | 226 | LIB_H += util/include/linux/poison.h |
227 | LIB_H += util/include/linux/rbtree.h | 227 | LIB_H += util/include/linux/rbtree.h |
228 | LIB_H += util/include/linux/rbtree_augmented.h | 228 | LIB_H += util/include/linux/rbtree_augmented.h |
diff --git a/tools/perf/util/include/linux/export.h b/tools/perf/util/include/linux/export.h deleted file mode 100644 index b43e2dc21e04..000000000000 --- a/tools/perf/util/include/linux/export.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef PERF_LINUX_MODULE_H | ||
2 | #define PERF_LINUX_MODULE_H | ||
3 | |||
4 | #define EXPORT_SYMBOL(name) | ||
5 | |||
6 | #endif | ||