From: Mathieu Desnoyers Date: Tue, 15 Mar 2016 16:12:46 +0000 (-0400) Subject: Move leftover relative include paths to system paths X-Git-Tag: v2.8.0-rc1~4 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=c075712b6e6ba766c844f4504ac012c49d1f6b4b;p=lttng-modules.git Move leftover relative include paths to system paths Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/arch/x86/exceptions.h b/instrumentation/events/lttng-module/arch/x86/exceptions.h index 7764a5dc..a4546cca 100644 --- a/instrumentation/events/lttng-module/arch/x86/exceptions.h +++ b/instrumentation/events/lttng-module/arch/x86/exceptions.h @@ -44,7 +44,7 @@ LTTNG_EXCEPTIONS_TRACEPOINT_EVENT_INSTANCE_MAP(page_fault_kernel, #endif /* LTTNG_TRACE_EXCEPTIONS_H */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86 +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86 #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE exceptions diff --git a/instrumentation/events/lttng-module/arch/x86/irq_vectors.h b/instrumentation/events/lttng-module/arch/x86/irq_vectors.h index 8207459f..c522aa7a 100644 --- a/instrumentation/events/lttng-module/arch/x86/irq_vectors.h +++ b/instrumentation/events/lttng-module/arch/x86/irq_vectors.h @@ -107,7 +107,7 @@ LTTNG_IRQ_VECTOR_TRACEPOINT_EVENT_INSTANCE_MAP(thermal_apic, #endif /* LTTNG_TRACE_IRQ_VECTORS_H */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86 +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86 #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE irq_vectors diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h index cc198366..ad09313d 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h @@ -210,7 +210,7 @@ LTTNG_TRACEPOINT_EVENT_MAP( #endif /* LTTNG_TRACE_KVM_MMU_H */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86/kvm +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86/kvm #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE mmutrace diff --git a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h index d6c8dbed..4d8e7631 100644 --- a/instrumentation/events/lttng-module/arch/x86/kvm/trace.h +++ b/instrumentation/events/lttng-module/arch/x86/kvm/trace.h @@ -515,7 +515,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(kvm_track_tsc, kvm_x86_track_tsc, #endif /* LTTNG_TRACE_KVM_H */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86/kvm +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86/kvm #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace diff --git a/lib/ringbuffer/config.h b/lib/ringbuffer/config.h index b8169afe..63189b95 100644 --- a/lib/ringbuffer/config.h +++ b/lib/ringbuffer/config.h @@ -310,6 +310,6 @@ int lib_ring_buffer_check_config(const struct lib_ring_buffer_config *config, return 0; } -#include "../../wrapper/ringbuffer/vatomic.h" +#include #endif /* _LIB_RING_BUFFER_CONFIG_H */ diff --git a/lib/ringbuffer/ring_buffer_backend.c b/lib/ringbuffer/ring_buffer_backend.c index 83a6e39b..f34c7ccc 100644 --- a/lib/ringbuffer/ring_buffer_backend.c +++ b/lib/ringbuffer/ring_buffer_backend.c @@ -28,10 +28,10 @@ #include #include -#include "../../wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */ -#include "../../wrapper/ringbuffer/config.h" -#include "../../wrapper/ringbuffer/backend.h" -#include "../../wrapper/ringbuffer/frontend.h" +#include /* for wrapper_vmalloc_sync_all() */ +#include +#include +#include /** * lib_ring_buffer_backend_allocate - allocate a channel buffer diff --git a/lib/ringbuffer/ring_buffer_frontend.c b/lib/ringbuffer/ring_buffer_frontend.c index dbe52c15..9ebdd5fb 100644 --- a/lib/ringbuffer/ring_buffer_frontend.c +++ b/lib/ringbuffer/ring_buffer_frontend.c @@ -55,14 +55,14 @@ #include #include -#include "../../wrapper/ringbuffer/config.h" -#include "../../wrapper/ringbuffer/backend.h" -#include "../../wrapper/ringbuffer/frontend.h" -#include "../../wrapper/ringbuffer/iterator.h" -#include "../../wrapper/ringbuffer/nohz.h" -#include "../../wrapper/atomic.h" -#include "../../wrapper/kref.h" -#include "../../wrapper/percpu-defs.h" +#include +#include +#include +#include +#include +#include +#include +#include /* * Internal structure representing offsets to use at a sub-buffer switch. diff --git a/lib/ringbuffer/ring_buffer_iterator.c b/lib/ringbuffer/ring_buffer_iterator.c index c6e52256..47e151bf 100644 --- a/lib/ringbuffer/ring_buffer_iterator.c +++ b/lib/ringbuffer/ring_buffer_iterator.c @@ -25,8 +25,8 @@ * Mathieu Desnoyers */ -#include "../../wrapper/ringbuffer/iterator.h" -#include "../../wrapper/file.h" +#include +#include #include #include #include diff --git a/lib/ringbuffer/ring_buffer_mmap.c b/lib/ringbuffer/ring_buffer_mmap.c index 2cc0dd24..35d30e7e 100644 --- a/lib/ringbuffer/ring_buffer_mmap.c +++ b/lib/ringbuffer/ring_buffer_mmap.c @@ -25,9 +25,9 @@ #include #include -#include "../../wrapper/ringbuffer/backend.h" -#include "../../wrapper/ringbuffer/frontend.h" -#include "../../wrapper/ringbuffer/vfs.h" +#include +#include +#include /* * fault() vm_op implementation for ring buffer file mapping. diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c index a1988f0b..0610caaf 100644 --- a/lib/ringbuffer/ring_buffer_splice.c +++ b/lib/ringbuffer/ring_buffer_splice.c @@ -27,10 +27,10 @@ #include #include -#include "../../wrapper/splice.h" -#include "../../wrapper/ringbuffer/backend.h" -#include "../../wrapper/ringbuffer/frontend.h" -#include "../../wrapper/ringbuffer/vfs.h" +#include +#include +#include +#include #if 0 #define printk_dbg(fmt, args...) printk(fmt, args) diff --git a/lib/ringbuffer/ring_buffer_vfs.c b/lib/ringbuffer/ring_buffer_vfs.c index 4389b5f6..f1a8bab7 100644 --- a/lib/ringbuffer/ring_buffer_vfs.c +++ b/lib/ringbuffer/ring_buffer_vfs.c @@ -24,11 +24,11 @@ #include #include -#include "../../wrapper/ringbuffer/backend.h" -#include "../../wrapper/ringbuffer/frontend.h" -#include "../../wrapper/ringbuffer/vfs.h" -#include "../../wrapper/poll.h" -#include "../../lttng-tracer.h" +#include +#include +#include +#include +#include static int put_ulong(unsigned long val, unsigned long arg) { diff --git a/lttng-syscalls.c b/lttng-syscalls.c index b759e847..f4e05b08 100644 --- a/lttng-syscalls.c +++ b/lttng-syscalls.c @@ -92,7 +92,7 @@ struct user_msghdr; #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS #define TP_MODULE_NOINIT -#define TRACE_INCLUDE_PATH ../instrumentation/syscalls/headers +#define TRACE_INCLUDE_PATH instrumentation/syscalls/headers #define PARAMS(args...) args diff --git a/probes/lttng-probe-x86-irq-vectors.c b/probes/lttng-probe-x86-irq-vectors.c index bc4b9a9c..7395c793 100644 --- a/probes/lttng-probe-x86-irq-vectors.c +++ b/probes/lttng-probe-x86-irq-vectors.c @@ -39,7 +39,7 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module/arch/x86 +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86 #include diff --git a/probes/lttng.c b/probes/lttng.c index 7d063ff7..58aa5154 100644 --- a/probes/lttng.c +++ b/probes/lttng.c @@ -34,7 +34,7 @@ #define TP_MODULE_NOAUTOLOAD #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module #define TRACE_INCLUDE_FILE lttng #define LTTNG_INSTRUMENTATION diff --git a/wrapper/ringbuffer/api.h b/wrapper/ringbuffer/api.h index 182bee28..d1ffd6de 100644 --- a/wrapper/ringbuffer/api.h +++ b/wrapper/ringbuffer/api.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/api.h" +#include diff --git a/wrapper/ringbuffer/backend.h b/wrapper/ringbuffer/backend.h index bfdd39de..cdb72093 100644 --- a/wrapper/ringbuffer/backend.h +++ b/wrapper/ringbuffer/backend.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/backend.h" +#include diff --git a/wrapper/ringbuffer/backend_internal.h b/wrapper/ringbuffer/backend_internal.h index 00d45e42..a2e4db16 100644 --- a/wrapper/ringbuffer/backend_internal.h +++ b/wrapper/ringbuffer/backend_internal.h @@ -1,2 +1,2 @@ -#include "../../wrapper/inline_memcpy.h" -#include "../../lib/ringbuffer/backend_internal.h" +#include +#include diff --git a/wrapper/ringbuffer/backend_types.h b/wrapper/ringbuffer/backend_types.h index c59effda..4d7a5ccd 100644 --- a/wrapper/ringbuffer/backend_types.h +++ b/wrapper/ringbuffer/backend_types.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/backend_types.h" +#include diff --git a/wrapper/ringbuffer/config.h b/wrapper/ringbuffer/config.h index 0ce7a9da..bbb9df37 100644 --- a/wrapper/ringbuffer/config.h +++ b/wrapper/ringbuffer/config.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/config.h" +#include diff --git a/wrapper/ringbuffer/frontend.h b/wrapper/ringbuffer/frontend.h index 7c6c0705..2ae49e26 100644 --- a/wrapper/ringbuffer/frontend.h +++ b/wrapper/ringbuffer/frontend.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/frontend.h" +#include diff --git a/wrapper/ringbuffer/frontend_api.h b/wrapper/ringbuffer/frontend_api.h index b03c501c..d785aadf 100644 --- a/wrapper/ringbuffer/frontend_api.h +++ b/wrapper/ringbuffer/frontend_api.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/frontend_api.h" +#include diff --git a/wrapper/ringbuffer/frontend_internal.h b/wrapper/ringbuffer/frontend_internal.h index 18991014..b2a4bc58 100644 --- a/wrapper/ringbuffer/frontend_internal.h +++ b/wrapper/ringbuffer/frontend_internal.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/frontend_internal.h" +#include diff --git a/wrapper/ringbuffer/frontend_types.h b/wrapper/ringbuffer/frontend_types.h index 0c23244b..f2764e54 100644 --- a/wrapper/ringbuffer/frontend_types.h +++ b/wrapper/ringbuffer/frontend_types.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/frontend_types.h" +#include diff --git a/wrapper/ringbuffer/iterator.h b/wrapper/ringbuffer/iterator.h index 76e9edbb..27f6b230 100644 --- a/wrapper/ringbuffer/iterator.h +++ b/wrapper/ringbuffer/iterator.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/iterator.h" +#include diff --git a/wrapper/ringbuffer/nohz.h b/wrapper/ringbuffer/nohz.h index 9fbb84d2..34bd03f5 100644 --- a/wrapper/ringbuffer/nohz.h +++ b/wrapper/ringbuffer/nohz.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/nohz.h" +#include diff --git a/wrapper/ringbuffer/vatomic.h b/wrapper/ringbuffer/vatomic.h index d5784452..7244425b 100644 --- a/wrapper/ringbuffer/vatomic.h +++ b/wrapper/ringbuffer/vatomic.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/vatomic.h" +#include diff --git a/wrapper/ringbuffer/vfs.h b/wrapper/ringbuffer/vfs.h index f8e9ed94..0af99361 100644 --- a/wrapper/ringbuffer/vfs.h +++ b/wrapper/ringbuffer/vfs.h @@ -1 +1 @@ -#include "../../lib/ringbuffer/vfs.h" +#include