Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ac3e4b6 authored by Borislav Petkov's avatar Borislav Petkov Committed by Jiri Olsa
Browse files

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: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarRusty 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: default avatarJiri Olsa <jolsa@kernel.org>
parent 3617660e

tools/virtio/linux/export.h→tools/include/linux/export.h

+5 −0
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_EXPORT_H_

#define _TOOLS_LINUX_EXPORT_H_



#define EXPORT_SYMBOL(sym)

#define EXPORT_SYMBOL_GPL(sym)

#define EXPORT_SYMBOL_GPL_FUTURE(sym)

#define EXPORT_UNUSED_SYMBOL(sym)

#define EXPORT_UNUSED_SYMBOL_GPL(sym)



#endif

tools/lib/lockdep/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ N = 


export Q VERBOSE



INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include $(CONFIG_INCLUDES)

INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES)



# Set compile option CFLAGS if not set elsewhere

CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g

tools/lib/lockdep/uinclude/linux/export.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef _LIBLOCKDEP_LINUX_EXPORT_H_

#define _LIBLOCKDEP_LINUX_EXPORT_H_



#define EXPORT_SYMBOL(sym)

#define EXPORT_SYMBOL_GPL(sym)



#endif

tools/perf/MANIFEST

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ tools/lib/symbol/kallsyms.h 
tools/include/asm/bug.h

tools/include/linux/compiler.h

tools/include/linux/hash.h

tools/include/linux/export.h

include/linux/const.h

include/linux/perf_event.h

include/linux/rbtree.h

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ LIB_H += util/include/linux/const.h 
LIB_H += util/include/linux/ctype.h

LIB_H += util/include/linux/kernel.h

LIB_H += util/include/linux/list.h

LIB_H += util/include/linux/export.h

LIB_H += ../include/linux/export.h

LIB_H += util/include/linux/poison.h

LIB_H += util/include/linux/rbtree.h

LIB_H += util/include/linux/rbtree_augmented.h