From 4f47ccf08dfac3d5db7553eb8b40bdab19764727 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 6 May 2020 13:44:57 -0400 Subject: [PATCH] Cleanup: Move lttng-modules instrumentation headers The directory hierarchy "instrumentation/events/lttng-module/" only exists for historical reasons and is not needed anymore. Move all its contents into "instrumentation/events/". Signed-off-by: Mathieu Desnoyers --- include/instrumentation/events/{lttng-module => }/9p.h | 0 include/instrumentation/events/README | 8 ++++---- .../events/{lttng-module => }/arch/x86/exceptions.h | 2 +- .../events/{lttng-module => }/arch/x86/irq_vectors.h | 2 +- .../events/{lttng-module => }/arch/x86/kvm/mmutrace.h | 2 +- .../events/{lttng-module => }/arch/x86/kvm/trace.h | 2 +- include/instrumentation/events/{lttng-module => }/asoc.h | 0 include/instrumentation/events/{lttng-module => }/block.h | 0 include/instrumentation/events/{lttng-module => }/btrfs.h | 0 .../events/{lttng-module => }/compaction.h | 0 include/instrumentation/events/{lttng-module => }/ext3.h | 0 include/instrumentation/events/{lttng-module => }/ext4.h | 0 include/instrumentation/events/{lttng-module => }/gpio.h | 0 include/instrumentation/events/{lttng-module => }/i2c.h | 0 include/instrumentation/events/{lttng-module => }/irq.h | 0 include/instrumentation/events/{lttng-module => }/jbd.h | 0 include/instrumentation/events/{lttng-module => }/jbd2.h | 0 include/instrumentation/events/{lttng-module => }/kmem.h | 0 include/instrumentation/events/{lttng-module => }/kvm.h | 0 include/instrumentation/events/{lttng-module => }/lock.h | 0 .../events/{lttng-module => }/lttng-statedump.h | 0 .../events/{lttng-module => }/lttng-test.h | 0 include/instrumentation/events/{lttng-module => }/lttng.h | 0 .../instrumentation/events/{lttng-module => }/mm_vmscan.h | 0 .../instrumentation/events/{lttng-module => }/module.h | 0 include/instrumentation/events/{lttng-module => }/napi.h | 0 include/instrumentation/events/{lttng-module => }/net.h | 0 include/instrumentation/events/{lttng-module => }/power.h | 0 .../events/{lttng-module => }/preemptirq.h | 0 .../instrumentation/events/{lttng-module => }/printk.h | 0 .../instrumentation/events/{lttng-module => }/random.h | 0 include/instrumentation/events/{lttng-module => }/rcu.h | 0 .../instrumentation/events/{lttng-module => }/regmap.h | 0 .../instrumentation/events/{lttng-module => }/regulator.h | 0 include/instrumentation/events/{lttng-module => }/rpc.h | 0 include/instrumentation/events/{lttng-module => }/rpm.h | 0 include/instrumentation/events/{lttng-module => }/sched.h | 0 include/instrumentation/events/{lttng-module => }/scsi.h | 0 .../instrumentation/events/{lttng-module => }/signal.h | 0 include/instrumentation/events/{lttng-module => }/skb.h | 0 include/instrumentation/events/{lttng-module => }/sock.h | 0 include/instrumentation/events/{lttng-module => }/timer.h | 0 include/instrumentation/events/{lttng-module => }/udp.h | 0 include/instrumentation/events/{lttng-module => }/v4l2.h | 0 .../instrumentation/events/{lttng-module => }/workqueue.h | 0 .../instrumentation/events/{lttng-module => }/writeback.h | 0 lttng-statedump-impl.c | 4 ++-- probes/lttng-probe-9p.c | 4 ++-- probes/lttng-probe-asoc.c | 4 ++-- probes/lttng-probe-block.c | 4 ++-- probes/lttng-probe-btrfs.c | 4 ++-- probes/lttng-probe-compaction.c | 4 ++-- probes/lttng-probe-ext3.c | 4 ++-- probes/lttng-probe-ext4.c | 4 ++-- probes/lttng-probe-gpio.c | 4 ++-- probes/lttng-probe-i2c.c | 4 ++-- probes/lttng-probe-irq.c | 4 ++-- probes/lttng-probe-jbd.c | 4 ++-- probes/lttng-probe-jbd2.c | 4 ++-- probes/lttng-probe-kmem.c | 4 ++-- probes/lttng-probe-kvm-x86-mmu.c | 4 ++-- probes/lttng-probe-kvm-x86.c | 4 ++-- probes/lttng-probe-kvm.c | 4 ++-- probes/lttng-probe-lock.c | 4 ++-- probes/lttng-probe-module.c | 4 ++-- probes/lttng-probe-napi.c | 4 ++-- probes/lttng-probe-net.c | 4 ++-- probes/lttng-probe-power.c | 4 ++-- probes/lttng-probe-preemptirq.c | 4 ++-- probes/lttng-probe-printk.c | 4 ++-- probes/lttng-probe-random.c | 4 ++-- probes/lttng-probe-rcu.c | 4 ++-- probes/lttng-probe-regmap.c | 4 ++-- probes/lttng-probe-regulator.c | 4 ++-- probes/lttng-probe-rpm.c | 4 ++-- probes/lttng-probe-sched.c | 4 ++-- probes/lttng-probe-scsi.c | 4 ++-- probes/lttng-probe-signal.c | 4 ++-- probes/lttng-probe-skb.c | 4 ++-- probes/lttng-probe-sock.c | 4 ++-- probes/lttng-probe-statedump.c | 4 ++-- probes/lttng-probe-sunrpc.c | 4 ++-- probes/lttng-probe-timer.c | 4 ++-- probes/lttng-probe-udp.c | 4 ++-- probes/lttng-probe-v4l2.c | 4 ++-- probes/lttng-probe-vmscan.c | 4 ++-- probes/lttng-probe-workqueue.c | 4 ++-- probes/lttng-probe-writeback.c | 4 ++-- probes/lttng-probe-x86-exceptions.c | 4 ++-- probes/lttng-probe-x86-irq-vectors.c | 4 ++-- probes/lttng.c | 4 ++-- tests/probes/lttng-test.c | 4 ++-- 92 files changed, 100 insertions(+), 100 deletions(-) rename include/instrumentation/events/{lttng-module => }/9p.h (100%) rename include/instrumentation/events/{lttng-module => }/arch/x86/exceptions.h (95%) rename include/instrumentation/events/{lttng-module => }/arch/x86/irq_vectors.h (97%) rename include/instrumentation/events/{lttng-module => }/arch/x86/kvm/mmutrace.h (98%) rename include/instrumentation/events/{lttng-module => }/arch/x86/kvm/trace.h (99%) rename include/instrumentation/events/{lttng-module => }/asoc.h (100%) rename include/instrumentation/events/{lttng-module => }/block.h (100%) rename include/instrumentation/events/{lttng-module => }/btrfs.h (100%) rename include/instrumentation/events/{lttng-module => }/compaction.h (100%) rename include/instrumentation/events/{lttng-module => }/ext3.h (100%) rename include/instrumentation/events/{lttng-module => }/ext4.h (100%) rename include/instrumentation/events/{lttng-module => }/gpio.h (100%) rename include/instrumentation/events/{lttng-module => }/i2c.h (100%) rename include/instrumentation/events/{lttng-module => }/irq.h (100%) rename include/instrumentation/events/{lttng-module => }/jbd.h (100%) rename include/instrumentation/events/{lttng-module => }/jbd2.h (100%) rename include/instrumentation/events/{lttng-module => }/kmem.h (100%) rename include/instrumentation/events/{lttng-module => }/kvm.h (100%) rename include/instrumentation/events/{lttng-module => }/lock.h (100%) rename include/instrumentation/events/{lttng-module => }/lttng-statedump.h (100%) rename include/instrumentation/events/{lttng-module => }/lttng-test.h (100%) rename include/instrumentation/events/{lttng-module => }/lttng.h (100%) rename include/instrumentation/events/{lttng-module => }/mm_vmscan.h (100%) rename include/instrumentation/events/{lttng-module => }/module.h (100%) rename include/instrumentation/events/{lttng-module => }/napi.h (100%) rename include/instrumentation/events/{lttng-module => }/net.h (100%) rename include/instrumentation/events/{lttng-module => }/power.h (100%) rename include/instrumentation/events/{lttng-module => }/preemptirq.h (100%) rename include/instrumentation/events/{lttng-module => }/printk.h (100%) rename include/instrumentation/events/{lttng-module => }/random.h (100%) rename include/instrumentation/events/{lttng-module => }/rcu.h (100%) rename include/instrumentation/events/{lttng-module => }/regmap.h (100%) rename include/instrumentation/events/{lttng-module => }/regulator.h (100%) rename include/instrumentation/events/{lttng-module => }/rpc.h (100%) rename include/instrumentation/events/{lttng-module => }/rpm.h (100%) rename include/instrumentation/events/{lttng-module => }/sched.h (100%) rename include/instrumentation/events/{lttng-module => }/scsi.h (100%) rename include/instrumentation/events/{lttng-module => }/signal.h (100%) rename include/instrumentation/events/{lttng-module => }/skb.h (100%) rename include/instrumentation/events/{lttng-module => }/sock.h (100%) rename include/instrumentation/events/{lttng-module => }/timer.h (100%) rename include/instrumentation/events/{lttng-module => }/udp.h (100%) rename include/instrumentation/events/{lttng-module => }/v4l2.h (100%) rename include/instrumentation/events/{lttng-module => }/workqueue.h (100%) rename include/instrumentation/events/{lttng-module => }/writeback.h (100%) diff --git a/include/instrumentation/events/lttng-module/9p.h b/include/instrumentation/events/9p.h similarity index 100% rename from include/instrumentation/events/lttng-module/9p.h rename to include/instrumentation/events/9p.h diff --git a/include/instrumentation/events/README b/include/instrumentation/events/README index fc3cd6e2..b13a30b9 100644 --- a/include/instrumentation/events/README +++ b/include/instrumentation/events/README @@ -1,6 +1,6 @@ * Workflow for updating patches from newer kernel: -Pull the new headers from mainline kernel to lttng-modules/. +Pull the new headers from mainline kernel to this subdirectory. Update those headers to fix the lttng-modules instrumentation style. @@ -10,10 +10,10 @@ Update those headers to fix the lttng-modules instrumentation style. a) instrument the kernel with new trace events headers. If you want that instrumentation distributed, you will have to push those changes into the upstream Linux kernel first, -b) copy those headers into lttng-modules/ directory, +b) copy those headers into this subdirectory, c) look at a diff from other headers between mainline kernel version and - lttng-modules/, and use that as a recipe to alter the new - lttng-modules/ headers. + those in this subdirectory, and use that as a recipe to alter the new + headers copy. d) create a new file in probes/ for the new trace event header you added, e) add it to probes/Makefile, f) build, make modules_install, diff --git a/include/instrumentation/events/lttng-module/arch/x86/exceptions.h b/include/instrumentation/events/arch/x86/exceptions.h similarity index 95% rename from include/instrumentation/events/lttng-module/arch/x86/exceptions.h rename to include/instrumentation/events/arch/x86/exceptions.h index eb55138a..b322f3e7 100644 --- a/include/instrumentation/events/lttng-module/arch/x86/exceptions.h +++ b/include/instrumentation/events/arch/x86/exceptions.h @@ -45,7 +45,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/arch/x86 #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE exceptions diff --git a/include/instrumentation/events/lttng-module/arch/x86/irq_vectors.h b/include/instrumentation/events/arch/x86/irq_vectors.h similarity index 97% rename from include/instrumentation/events/lttng-module/arch/x86/irq_vectors.h rename to include/instrumentation/events/arch/x86/irq_vectors.h index ff0f45b8..dc0e002b 100644 --- a/include/instrumentation/events/lttng-module/arch/x86/irq_vectors.h +++ b/include/instrumentation/events/arch/x86/irq_vectors.h @@ -108,7 +108,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/arch/x86 #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE irq_vectors diff --git a/include/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h b/include/instrumentation/events/arch/x86/kvm/mmutrace.h similarity index 98% rename from include/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h rename to include/instrumentation/events/arch/x86/kvm/mmutrace.h index 1195ded7..05dd3d6d 100644 --- a/include/instrumentation/events/lttng-module/arch/x86/kvm/mmutrace.h +++ b/include/instrumentation/events/arch/x86/kvm/mmutrace.h @@ -266,7 +266,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/arch/x86/kvm #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE mmutrace diff --git a/include/instrumentation/events/lttng-module/arch/x86/kvm/trace.h b/include/instrumentation/events/arch/x86/kvm/trace.h similarity index 99% rename from include/instrumentation/events/lttng-module/arch/x86/kvm/trace.h rename to include/instrumentation/events/arch/x86/kvm/trace.h index 1b3b9ebc..4f09e625 100644 --- a/include/instrumentation/events/lttng-module/arch/x86/kvm/trace.h +++ b/include/instrumentation/events/arch/x86/kvm/trace.h @@ -532,7 +532,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/arch/x86/kvm #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace diff --git a/include/instrumentation/events/lttng-module/asoc.h b/include/instrumentation/events/asoc.h similarity index 100% rename from include/instrumentation/events/lttng-module/asoc.h rename to include/instrumentation/events/asoc.h diff --git a/include/instrumentation/events/lttng-module/block.h b/include/instrumentation/events/block.h similarity index 100% rename from include/instrumentation/events/lttng-module/block.h rename to include/instrumentation/events/block.h diff --git a/include/instrumentation/events/lttng-module/btrfs.h b/include/instrumentation/events/btrfs.h similarity index 100% rename from include/instrumentation/events/lttng-module/btrfs.h rename to include/instrumentation/events/btrfs.h diff --git a/include/instrumentation/events/lttng-module/compaction.h b/include/instrumentation/events/compaction.h similarity index 100% rename from include/instrumentation/events/lttng-module/compaction.h rename to include/instrumentation/events/compaction.h diff --git a/include/instrumentation/events/lttng-module/ext3.h b/include/instrumentation/events/ext3.h similarity index 100% rename from include/instrumentation/events/lttng-module/ext3.h rename to include/instrumentation/events/ext3.h diff --git a/include/instrumentation/events/lttng-module/ext4.h b/include/instrumentation/events/ext4.h similarity index 100% rename from include/instrumentation/events/lttng-module/ext4.h rename to include/instrumentation/events/ext4.h diff --git a/include/instrumentation/events/lttng-module/gpio.h b/include/instrumentation/events/gpio.h similarity index 100% rename from include/instrumentation/events/lttng-module/gpio.h rename to include/instrumentation/events/gpio.h diff --git a/include/instrumentation/events/lttng-module/i2c.h b/include/instrumentation/events/i2c.h similarity index 100% rename from include/instrumentation/events/lttng-module/i2c.h rename to include/instrumentation/events/i2c.h diff --git a/include/instrumentation/events/lttng-module/irq.h b/include/instrumentation/events/irq.h similarity index 100% rename from include/instrumentation/events/lttng-module/irq.h rename to include/instrumentation/events/irq.h diff --git a/include/instrumentation/events/lttng-module/jbd.h b/include/instrumentation/events/jbd.h similarity index 100% rename from include/instrumentation/events/lttng-module/jbd.h rename to include/instrumentation/events/jbd.h diff --git a/include/instrumentation/events/lttng-module/jbd2.h b/include/instrumentation/events/jbd2.h similarity index 100% rename from include/instrumentation/events/lttng-module/jbd2.h rename to include/instrumentation/events/jbd2.h diff --git a/include/instrumentation/events/lttng-module/kmem.h b/include/instrumentation/events/kmem.h similarity index 100% rename from include/instrumentation/events/lttng-module/kmem.h rename to include/instrumentation/events/kmem.h diff --git a/include/instrumentation/events/lttng-module/kvm.h b/include/instrumentation/events/kvm.h similarity index 100% rename from include/instrumentation/events/lttng-module/kvm.h rename to include/instrumentation/events/kvm.h diff --git a/include/instrumentation/events/lttng-module/lock.h b/include/instrumentation/events/lock.h similarity index 100% rename from include/instrumentation/events/lttng-module/lock.h rename to include/instrumentation/events/lock.h diff --git a/include/instrumentation/events/lttng-module/lttng-statedump.h b/include/instrumentation/events/lttng-statedump.h similarity index 100% rename from include/instrumentation/events/lttng-module/lttng-statedump.h rename to include/instrumentation/events/lttng-statedump.h diff --git a/include/instrumentation/events/lttng-module/lttng-test.h b/include/instrumentation/events/lttng-test.h similarity index 100% rename from include/instrumentation/events/lttng-module/lttng-test.h rename to include/instrumentation/events/lttng-test.h diff --git a/include/instrumentation/events/lttng-module/lttng.h b/include/instrumentation/events/lttng.h similarity index 100% rename from include/instrumentation/events/lttng-module/lttng.h rename to include/instrumentation/events/lttng.h diff --git a/include/instrumentation/events/lttng-module/mm_vmscan.h b/include/instrumentation/events/mm_vmscan.h similarity index 100% rename from include/instrumentation/events/lttng-module/mm_vmscan.h rename to include/instrumentation/events/mm_vmscan.h diff --git a/include/instrumentation/events/lttng-module/module.h b/include/instrumentation/events/module.h similarity index 100% rename from include/instrumentation/events/lttng-module/module.h rename to include/instrumentation/events/module.h diff --git a/include/instrumentation/events/lttng-module/napi.h b/include/instrumentation/events/napi.h similarity index 100% rename from include/instrumentation/events/lttng-module/napi.h rename to include/instrumentation/events/napi.h diff --git a/include/instrumentation/events/lttng-module/net.h b/include/instrumentation/events/net.h similarity index 100% rename from include/instrumentation/events/lttng-module/net.h rename to include/instrumentation/events/net.h diff --git a/include/instrumentation/events/lttng-module/power.h b/include/instrumentation/events/power.h similarity index 100% rename from include/instrumentation/events/lttng-module/power.h rename to include/instrumentation/events/power.h diff --git a/include/instrumentation/events/lttng-module/preemptirq.h b/include/instrumentation/events/preemptirq.h similarity index 100% rename from include/instrumentation/events/lttng-module/preemptirq.h rename to include/instrumentation/events/preemptirq.h diff --git a/include/instrumentation/events/lttng-module/printk.h b/include/instrumentation/events/printk.h similarity index 100% rename from include/instrumentation/events/lttng-module/printk.h rename to include/instrumentation/events/printk.h diff --git a/include/instrumentation/events/lttng-module/random.h b/include/instrumentation/events/random.h similarity index 100% rename from include/instrumentation/events/lttng-module/random.h rename to include/instrumentation/events/random.h diff --git a/include/instrumentation/events/lttng-module/rcu.h b/include/instrumentation/events/rcu.h similarity index 100% rename from include/instrumentation/events/lttng-module/rcu.h rename to include/instrumentation/events/rcu.h diff --git a/include/instrumentation/events/lttng-module/regmap.h b/include/instrumentation/events/regmap.h similarity index 100% rename from include/instrumentation/events/lttng-module/regmap.h rename to include/instrumentation/events/regmap.h diff --git a/include/instrumentation/events/lttng-module/regulator.h b/include/instrumentation/events/regulator.h similarity index 100% rename from include/instrumentation/events/lttng-module/regulator.h rename to include/instrumentation/events/regulator.h diff --git a/include/instrumentation/events/lttng-module/rpc.h b/include/instrumentation/events/rpc.h similarity index 100% rename from include/instrumentation/events/lttng-module/rpc.h rename to include/instrumentation/events/rpc.h diff --git a/include/instrumentation/events/lttng-module/rpm.h b/include/instrumentation/events/rpm.h similarity index 100% rename from include/instrumentation/events/lttng-module/rpm.h rename to include/instrumentation/events/rpm.h diff --git a/include/instrumentation/events/lttng-module/sched.h b/include/instrumentation/events/sched.h similarity index 100% rename from include/instrumentation/events/lttng-module/sched.h rename to include/instrumentation/events/sched.h diff --git a/include/instrumentation/events/lttng-module/scsi.h b/include/instrumentation/events/scsi.h similarity index 100% rename from include/instrumentation/events/lttng-module/scsi.h rename to include/instrumentation/events/scsi.h diff --git a/include/instrumentation/events/lttng-module/signal.h b/include/instrumentation/events/signal.h similarity index 100% rename from include/instrumentation/events/lttng-module/signal.h rename to include/instrumentation/events/signal.h diff --git a/include/instrumentation/events/lttng-module/skb.h b/include/instrumentation/events/skb.h similarity index 100% rename from include/instrumentation/events/lttng-module/skb.h rename to include/instrumentation/events/skb.h diff --git a/include/instrumentation/events/lttng-module/sock.h b/include/instrumentation/events/sock.h similarity index 100% rename from include/instrumentation/events/lttng-module/sock.h rename to include/instrumentation/events/sock.h diff --git a/include/instrumentation/events/lttng-module/timer.h b/include/instrumentation/events/timer.h similarity index 100% rename from include/instrumentation/events/lttng-module/timer.h rename to include/instrumentation/events/timer.h diff --git a/include/instrumentation/events/lttng-module/udp.h b/include/instrumentation/events/udp.h similarity index 100% rename from include/instrumentation/events/lttng-module/udp.h rename to include/instrumentation/events/udp.h diff --git a/include/instrumentation/events/lttng-module/v4l2.h b/include/instrumentation/events/v4l2.h similarity index 100% rename from include/instrumentation/events/lttng-module/v4l2.h rename to include/instrumentation/events/v4l2.h diff --git a/include/instrumentation/events/lttng-module/workqueue.h b/include/instrumentation/events/workqueue.h similarity index 100% rename from include/instrumentation/events/lttng-module/workqueue.h rename to include/instrumentation/events/workqueue.h diff --git a/include/instrumentation/events/lttng-module/writeback.h b/include/instrumentation/events/writeback.h similarity index 100% rename from include/instrumentation/events/lttng-module/writeback.h rename to include/instrumentation/events/writeback.h diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c index da05924f..1a2a12ba 100644 --- a/lttng-statedump-impl.c +++ b/lttng-statedump-impl.c @@ -50,10 +50,10 @@ /* Define the tracepoints, but do not build the probes */ #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events #define TRACE_INCLUDE_FILE lttng-statedump #define LTTNG_INSTRUMENTATION -#include +#include DEFINE_TRACE(lttng_statedump_block_device); DEFINE_TRACE(lttng_statedump_end); diff --git a/probes/lttng-probe-9p.c b/probes/lttng-probe-9p.c index 0da7cf4a..ec588e44 100644 --- a/probes/lttng-probe-9p.c +++ b/probes/lttng-probe-9p.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Michael Jeanson "); diff --git a/probes/lttng-probe-asoc.c b/probes/lttng-probe-asoc.c index ce73cea5..6cac9c6b 100644 --- a/probes/lttng-probe-asoc.c +++ b/probes/lttng-probe-asoc.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-block.c b/probes/lttng-probe-block.c index eceed5df..5f8e830f 100644 --- a/probes/lttng-probe-block.c +++ b/probes/lttng-probe-block.c @@ -25,9 +25,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-btrfs.c b/probes/lttng-probe-btrfs.c index b6a38eee..4461c998 100644 --- a/probes/lttng-probe-btrfs.c +++ b/probes/lttng-probe-btrfs.c @@ -31,9 +31,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-compaction.c b/probes/lttng-probe-compaction.c index 225eef45..f8ddf384 100644 --- a/probes/lttng-probe-compaction.c +++ b/probes/lttng-probe-compaction.c @@ -22,9 +22,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-ext3.c b/probes/lttng-probe-ext3.c index a66241fe..70adb56a 100644 --- a/probes/lttng-probe-ext3.c +++ b/probes/lttng-probe-ext3.c @@ -31,9 +31,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth , Paul Woegerer , and Andrew Gabbasov "); diff --git a/probes/lttng-probe-ext4.c b/probes/lttng-probe-ext4.c index 4f089f6f..0d0e3a82 100644 --- a/probes/lttng-probe-ext4.c +++ b/probes/lttng-probe-ext4.c @@ -30,9 +30,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-gpio.c b/probes/lttng-probe-gpio.c index e3c99efc..42b9b13f 100644 --- a/probes/lttng-probe-gpio.c +++ b/probes/lttng-probe-gpio.c @@ -22,9 +22,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-i2c.c b/probes/lttng-probe-i2c.c index 7c99bf86..9dc1c79e 100644 --- a/probes/lttng-probe-i2c.c +++ b/probes/lttng-probe-i2c.c @@ -23,7 +23,7 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events static int extract_sensitive_payload; module_param(extract_sensitive_payload, int, 0644); @@ -31,7 +31,7 @@ MODULE_PARM_DESC(extract_sensitive_payload, "Whether to extract possibly sensitive data from events (i2c " "buffer contents) or not (1 or 0, default: 0)."); -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Simon Marchi "); diff --git a/probes/lttng-probe-irq.c b/probes/lttng-probe-irq.c index fec72766..f88093b8 100644 --- a/probes/lttng-probe-irq.c +++ b/probes/lttng-probe-irq.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-jbd.c b/probes/lttng-probe-jbd.c index f6f89336..21c07982 100644 --- a/probes/lttng-probe-jbd.c +++ b/probes/lttng-probe-jbd.c @@ -22,9 +22,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth , Paul Woegerer , and Andrew Gabbasov "); diff --git a/probes/lttng-probe-jbd2.c b/probes/lttng-probe-jbd2.c index 007cf1e1..ac3ac936 100644 --- a/probes/lttng-probe-jbd2.c +++ b/probes/lttng-probe-jbd2.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-kmem.c b/probes/lttng-probe-kmem.c index 96340b04..1b120ab8 100644 --- a/probes/lttng-probe-kmem.c +++ b/probes/lttng-probe-kmem.c @@ -30,9 +30,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-kvm-x86-mmu.c b/probes/lttng-probe-kvm-x86-mmu.c index b915d365..9ccc2422 100644 --- a/probes/lttng-probe-kvm-x86-mmu.c +++ b/probes/lttng-probe-kvm-x86-mmu.c @@ -35,8 +35,8 @@ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86/kvm -#include +#define TRACE_INCLUDE_PATH instrumentation/events/arch/x86/kvm +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-kvm-x86.c b/probes/lttng-probe-kvm-x86.c index 30a6cc0c..4e4f5c83 100644 --- a/probes/lttng-probe-kvm-x86.c +++ b/probes/lttng-probe-kvm-x86.c @@ -36,8 +36,8 @@ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86/kvm -#include +#define TRACE_INCLUDE_PATH instrumentation/events/arch/x86/kvm +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-kvm.c b/probes/lttng-probe-kvm.c index 93044657..8b30f26a 100644 --- a/probes/lttng-probe-kvm.c +++ b/probes/lttng-probe-kvm.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-lock.c b/probes/lttng-probe-lock.c index 0890e591..2ab91385 100644 --- a/probes/lttng-probe-lock.c +++ b/probes/lttng-probe-lock.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth and Andrew Gabbasov "); diff --git a/probes/lttng-probe-module.c b/probes/lttng-probe-module.c index c0ddf43e..4f4f4a5b 100644 --- a/probes/lttng-probe-module.c +++ b/probes/lttng-probe-module.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-napi.c b/probes/lttng-probe-napi.c index 35a8e109..ce2bf8cc 100644 --- a/probes/lttng-probe-napi.c +++ b/probes/lttng-probe-napi.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-net.c b/probes/lttng-probe-net.c index c6e7fc56..a0ef450c 100644 --- a/probes/lttng-probe-net.c +++ b/probes/lttng-probe-net.c @@ -22,9 +22,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-power.c b/probes/lttng-probe-power.c index b72d3008..d5ac38f9 100644 --- a/probes/lttng-probe-power.c +++ b/probes/lttng-probe-power.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-preemptirq.c b/probes/lttng-probe-preemptirq.c index d47152f7..497b2de4 100644 --- a/probes/lttng-probe-preemptirq.c +++ b/probes/lttng-probe-preemptirq.c @@ -23,9 +23,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Michael Jeanson "); diff --git a/probes/lttng-probe-printk.c b/probes/lttng-probe-printk.c index db32ac60..3a37826e 100644 --- a/probes/lttng-probe-printk.c +++ b/probes/lttng-probe-printk.c @@ -22,9 +22,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-random.c b/probes/lttng-probe-random.c index 6f7787a7..4cf6ce80 100644 --- a/probes/lttng-probe-random.c +++ b/probes/lttng-probe-random.c @@ -22,9 +22,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-rcu.c b/probes/lttng-probe-rcu.c index 0d9f0f53..89c7213b 100644 --- a/probes/lttng-probe-rcu.c +++ b/probes/lttng-probe-rcu.c @@ -23,9 +23,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-regmap.c b/probes/lttng-probe-regmap.c index 30aab4f3..f3eaef8c 100644 --- a/probes/lttng-probe-regmap.c +++ b/probes/lttng-probe-regmap.c @@ -27,9 +27,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-regulator.c b/probes/lttng-probe-regulator.c index 4a7b24b9..8f457711 100644 --- a/probes/lttng-probe-regulator.c +++ b/probes/lttng-probe-regulator.c @@ -22,9 +22,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-rpm.c b/probes/lttng-probe-rpm.c index bb0b58a9..eea7bc38 100644 --- a/probes/lttng-probe-rpm.c +++ b/probes/lttng-probe-rpm.c @@ -23,9 +23,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-sched.c b/probes/lttng-probe-sched.c index f369d810..ba1b3f72 100644 --- a/probes/lttng-probe-sched.c +++ b/probes/lttng-probe-sched.c @@ -23,9 +23,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-scsi.c b/probes/lttng-probe-scsi.c index f220cfe8..a367c51e 100644 --- a/probes/lttng-probe-scsi.c +++ b/probes/lttng-probe-scsi.c @@ -23,9 +23,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-signal.c b/probes/lttng-probe-signal.c index 3c270f90..aee94681 100644 --- a/probes/lttng-probe-signal.c +++ b/probes/lttng-probe-signal.c @@ -21,9 +21,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-skb.c b/probes/lttng-probe-skb.c index f471fd3e..682a9f09 100644 --- a/probes/lttng-probe-skb.c +++ b/probes/lttng-probe-skb.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-sock.c b/probes/lttng-probe-sock.c index 2f57d813..f3e1ebf4 100644 --- a/probes/lttng-probe-sock.c +++ b/probes/lttng-probe-sock.c @@ -22,9 +22,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-statedump.c b/probes/lttng-probe-statedump.c index ea07697f..81e0613f 100644 --- a/probes/lttng-probe-statedump.c +++ b/probes/lttng-probe-statedump.c @@ -24,10 +24,10 @@ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS #define TP_SESSION_CHECK -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events #define TRACE_INCLUDE_FILE lttng-statedump -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-sunrpc.c b/probes/lttng-probe-sunrpc.c index 3953d8c5..2244a57f 100644 --- a/probes/lttng-probe-sunrpc.c +++ b/probes/lttng-probe-sunrpc.c @@ -22,9 +22,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-timer.c b/probes/lttng-probe-timer.c index b5ef884b..149fcbcb 100644 --- a/probes/lttng-probe-timer.c +++ b/probes/lttng-probe-timer.c @@ -25,9 +25,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-udp.c b/probes/lttng-probe-udp.c index 495c0afd..ad7707b5 100644 --- a/probes/lttng-probe-udp.c +++ b/probes/lttng-probe-udp.c @@ -22,9 +22,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-v4l2.c b/probes/lttng-probe-v4l2.c index b5ebffab..0c86da04 100644 --- a/probes/lttng-probe-v4l2.c +++ b/probes/lttng-probe-v4l2.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-vmscan.c b/probes/lttng-probe-vmscan.c index eb41c545..8e1f605a 100644 --- a/probes/lttng-probe-vmscan.c +++ b/probes/lttng-probe-vmscan.c @@ -24,9 +24,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Wade Farnsworth "); diff --git a/probes/lttng-probe-workqueue.c b/probes/lttng-probe-workqueue.c index dd5308ea..57cd5602 100644 --- a/probes/lttng-probe-workqueue.c +++ b/probes/lttng-probe-workqueue.c @@ -28,9 +28,9 @@ struct pool_workqueue; */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-writeback.c b/probes/lttng-probe-writeback.c index 5db92f6e..727f2b7f 100644 --- a/probes/lttng-probe-writeback.c +++ b/probes/lttng-probe-writeback.c @@ -33,9 +33,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module +#define TRACE_INCLUDE_PATH instrumentation/events -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Andrew Gabbasov "); diff --git a/probes/lttng-probe-x86-exceptions.c b/probes/lttng-probe-x86-exceptions.c index b7ded802..4a7d4e4c 100644 --- a/probes/lttng-probe-x86-exceptions.c +++ b/probes/lttng-probe-x86-exceptions.c @@ -26,9 +26,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86 +#define TRACE_INCLUDE_PATH instrumentation/events/arch/x86 -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng-probe-x86-irq-vectors.c b/probes/lttng-probe-x86-irq-vectors.c index 5a3da868..1f644061 100644 --- a/probes/lttng-probe-x86-irq-vectors.c +++ b/probes/lttng-probe-x86-irq-vectors.c @@ -26,9 +26,9 @@ */ #define LTTNG_PACKAGE_BUILD #define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module/arch/x86 +#define TRACE_INCLUDE_PATH instrumentation/events/arch/x86 -#include +#include MODULE_LICENSE("GPL and additional rights"); MODULE_AUTHOR("Mathieu Desnoyers "); diff --git a/probes/lttng.c b/probes/lttng.c index 0d3182ff..8a0dd4b8 100644 --- a/probes/lttng.c +++ b/probes/lttng.c @@ -22,11 +22,11 @@ #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 #define TRACE_INCLUDE_FILE lttng #define LTTNG_INSTRUMENTATION -#include +#include /* Events written through logger are truncated at 1024 bytes */ #define LTTNG_LOGGER_COUNT_MAX 1024 diff --git a/tests/probes/lttng-test.c b/tests/probes/lttng-test.c index ea273893..5064a685 100644 --- a/tests/probes/lttng-test.c +++ b/tests/probes/lttng-test.c @@ -20,10 +20,10 @@ #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 #define TRACE_INCLUDE_FILE lttng-test #define LTTNG_INSTRUMENTATION -#include +#include DEFINE_TRACE(lttng_test_filter_event); -- 2.34.1