tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Borislav Petkov and committed by
Jiri Olsa 5ac3e4b6 3617660e

+9 -16
+1 -1
tools/lib/lockdep/Makefile
··· 105 105 106 106 export Q VERBOSE 107 107 108 - INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include $(CONFIG_INCLUDES) 108 + INCLUDES = -I. -I/usr/local/include -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES) 109 109 110 110 # Set compile option CFLAGS if not set elsewhere 111 111 CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g
-7
tools/lib/lockdep/uinclude/linux/export.h
··· 1 - #ifndef _LIBLOCKDEP_LINUX_EXPORT_H_ 2 - #define _LIBLOCKDEP_LINUX_EXPORT_H_ 3 - 4 - #define EXPORT_SYMBOL(sym) 5 - #define EXPORT_SYMBOL_GPL(sym) 6 - 7 - #endif
+1
tools/perf/MANIFEST
··· 7 7 tools/include/asm/bug.h 8 8 tools/include/linux/compiler.h 9 9 tools/include/linux/hash.h 10 + tools/include/linux/export.h 10 11 include/linux/const.h 11 12 include/linux/perf_event.h 12 13 include/linux/rbtree.h
+1 -1
tools/perf/Makefile.perf
··· 222 222 LIB_H += util/include/linux/ctype.h 223 223 LIB_H += util/include/linux/kernel.h 224 224 LIB_H += util/include/linux/list.h 225 - LIB_H += util/include/linux/export.h 225 + LIB_H += ../include/linux/export.h 226 226 LIB_H += util/include/linux/poison.h 227 227 LIB_H += util/include/linux/rbtree.h 228 228 LIB_H += util/include/linux/rbtree_augmented.h
-6
tools/perf/util/include/linux/export.h
··· 1 - #ifndef PERF_LINUX_MODULE_H 2 - #define PERF_LINUX_MODULE_H 3 - 4 - #define EXPORT_SYMBOL(name) 5 - 6 - #endif
+1 -1
tools/virtio/Makefile
··· 3 3 virtio_test: virtio_ring.o virtio_test.o 4 4 vringh_test: vringh_test.o vringh.o virtio_ring.o 5 5 6 - CFLAGS += -g -O2 -Wall -I. -I ../../usr/include/ -Wno-pointer-sign -fno-strict-overflow -fno-strict-aliasing -fno-common -MMD -U_FORTIFY_SOURCE 6 + CFLAGS += -g -O2 -Wall -I. -I../include/ -I ../../usr/include/ -Wno-pointer-sign -fno-strict-overflow -fno-strict-aliasing -fno-common -MMD -U_FORTIFY_SOURCE 7 7 vpath %.c ../../drivers/virtio ../../drivers/vhost 8 8 mod: 9 9 ${MAKE} -C `pwd`/../.. M=`pwd`/vhost_test
+5
tools/virtio/linux/export.h tools/include/linux/export.h
··· 1 + #ifndef _TOOLS_LINUX_EXPORT_H_ 2 + #define _TOOLS_LINUX_EXPORT_H_ 3 + 1 4 #define EXPORT_SYMBOL(sym) 2 5 #define EXPORT_SYMBOL_GPL(sym) 3 6 #define EXPORT_SYMBOL_GPL_FUTURE(sym) 4 7 #define EXPORT_UNUSED_SYMBOL(sym) 5 8 #define EXPORT_UNUSED_SYMBOL_GPL(sym) 9 + 10 + #endif