Use system include path in wrappers

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/wrapper/fdtable.c b/wrapper/fdtable.c
index a44beb5521888da9043a3dd23125690194181e98..ef39ba6320c9bd277d7fbf07907d5847eeb39b01 100644 (file)
--- a/wrapper/fdtable.c
+++ b/wrapper/fdtable.c
@@ -20,7 +20,7 @@
 
 #include <linux/version.h>
 #include <linux/spinlock.h>
-#include "fdtable.h"
+#include <wrapper/fdtable.h>
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0))
 

diff --git a/wrapper/ftrace.h b/wrapper/ftrace.h
index 064f9c7cab1dc5aed9a7045cef562bdfcbc4043d..6fd1d55c11a391872c17360c280f936e6158b8cd 100644 (file)
--- a/wrapper/ftrace.h
+++ b/wrapper/ftrace.h
@@ -30,7 +30,7 @@
 #ifdef CONFIG_KALLSYMS
 
 #include <linux/kallsyms.h>
-#include "kallsyms.h"
+#include <wrapper/kallsyms.h>
 
 static inline
 int wrapper_register_ftrace_function_probe(char *glob,

diff --git a/wrapper/genhd.h b/wrapper/genhd.h
index 5bb390b6f9f98255052311fd1493ba364e1c2e30..4184bd011d3e9dc8c23c607cbf7f379abe4f3bf2 100644 (file)
--- a/wrapper/genhd.h
+++ b/wrapper/genhd.h
@@ -30,7 +30,7 @@
 #ifdef CONFIG_KALLSYMS
 
 #include <linux/kallsyms.h>
-#include "kallsyms.h"
+#include <wrapper/kallsyms.h>
 
 static inline
 char *wrapper_disk_name(struct gendisk *hd, int partno, char *buf)

diff --git a/wrapper/irqdesc.c b/wrapper/irqdesc.c
index 889fcd03d2e1257bf8aae152acf18cb32d1bad5d..6ef86c2d5416b7e63c746babb843640f9c4a9060 100644 (file)
--- a/wrapper/irqdesc.c
+++ b/wrapper/irqdesc.c
@@ -27,8 +27,8 @@
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>
 #include <linux/irqnr.h>
-#include "kallsyms.h"
-#include "irqdesc.h"
+#include <wrapper/kallsyms.h>
+#include <wrapper/irqdesc.h>
 
 static
 struct irq_desc *(*irq_to_desc_sym)(unsigned int irq);

diff --git a/wrapper/page_alloc.c b/wrapper/page_alloc.c
index a26f136f036af7d562b6c8057ca021dec17ef9c4..dc1fbed225fd6aefce00661aa1c7581793246e0f 100644 (file)
--- a/wrapper/page_alloc.c
+++ b/wrapper/page_alloc.c
@@ -23,7 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../lttng-kernel-version.h"
+#include <lttng-kernel-version.h>
 
 #if (defined(CONFIG_KALLSYMS) \
        && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,2)        \
@@ -35,8 +35,8 @@
 #include <linux/kallsyms.h>
 #include <linux/mm_types.h>
 #include <linux/module.h>
-#include "kallsyms.h"
-#include "page_alloc.h"
+#include <wrapper/kallsyms.h>
+#include <wrapper/page_alloc.h>
 
 static
 unsigned long (*get_pfnblock_flags_mask_sym)(struct page *page,
@@ -79,8 +79,8 @@ int wrapper_get_pfnblock_flags_mask_init(void)
 #include <linux/kallsyms.h>
 #include <linux/mm_types.h>
 #include <linux/module.h>
-#include "kallsyms.h"
-#include "page_alloc.h"
+#include <wrapper/kallsyms.h>
+#include <wrapper/page_alloc.h>
 
 static
 unsigned long (*get_pageblock_flags_mask_sym)(struct page *page,

diff --git a/wrapper/page_alloc.h b/wrapper/page_alloc.h
index 7802a12a960ae4bf08193fefc3ae733e256e7049..3a522a9d3307e221a68e19af688c9879d3d3d485 100644 (file)
--- a/wrapper/page_alloc.h
+++ b/wrapper/page_alloc.h
@@ -25,7 +25,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../lttng-kernel-version.h"
+#include <lttng-kernel-version.h>
 
 /*
  * We need to redefine get_pfnblock_flags_mask to our wrapper, because

diff --git a/wrapper/random.c b/wrapper/random.c
index 5b88f7edd7a5e60d1d8444b40e3047869ea247f0..5151f9a9e822795ea1984ca1a051baf3d1b8c947 100644 (file)
--- a/wrapper/random.c
+++ b/wrapper/random.c
@@ -29,7 +29,7 @@
 #include <linux/file.h>
 #include <linux/sched.h>
 #include <linux/uaccess.h>
-#include "random.h"
+#include <wrapper/random.h>
 
 /*
  * Returns string boot id.

diff --git a/wrapper/random.h b/wrapper/random.h
index 81d7995c573580c384ed7fe36d709b47ebb29944..d3a94878e673c6bc915714137dcbd25785b23cab 100644 (file)
--- a/wrapper/random.h
+++ b/wrapper/random.h
@@ -25,7 +25,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../lttng-clock.h"
+#include <lttng-clock.h>
 
 #define BOOT_ID_LEN    LTTNG_MODULES_UUID_STR_LEN
 

diff --git a/wrapper/rcu.h b/wrapper/rcu.h
index 8c4cd7442c1907f6839d6629849b3c2b735187d8..2fc60b137814e66dd08455a92cc06673bbaca1f3 100644 (file)
--- a/wrapper/rcu.h
+++ b/wrapper/rcu.h
@@ -26,7 +26,7 @@
 #include <linux/version.h>
 #include <linux/rculist.h>
 #include <linux/rcupdate.h>
-#include "list.h"
+#include <wrapper/list.h>
 
 #ifndef rcu_dereference_raw_notrace
 #define rcu_dereference_raw_notrace(p) rcu_dereference_raw(p)

diff --git a/wrapper/splice.c b/wrapper/splice.c
index 0ef8dd99653a4c976e701749ba0ae97fc48b1ded..357e1ac5a84560dca04613ab718ca76a535d2032 100644 (file)
--- a/wrapper/splice.c
+++ b/wrapper/splice.c
@@ -27,7 +27,7 @@
 #include <linux/kallsyms.h>
 #include <linux/fs.h>
 #include <linux/splice.h>
-#include "kallsyms.h"
+#include <wrapper/kallsyms.h>
 
 static
 ssize_t (*splice_to_pipe_sym)(struct pipe_inode_info *pipe,

diff --git a/wrapper/trace-clock.c b/wrapper/trace-clock.c
index 1b7a21767289d4f122a6e393bb37a7430c57026b..23869ca831a79069d0f6336c5df1b2d834449919 100644 (file)
--- a/wrapper/trace-clock.c
+++ b/wrapper/trace-clock.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "trace-clock.h"
+#include <wrapper/trace-clock.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0))
 DEFINE_PER_CPU(local_t, lttng_last_tsc);

diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index d6439c7fb13bb1249560e1351cf649a94056414f..efb49f4c2ed57dde712b74d3855e4e2e903f700c 100644 (file)
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -35,10 +35,10 @@
 #include <linux/percpu.h>
 #include <linux/version.h>
 #include <asm/local.h>
-#include "../lttng-kernel-version.h"
-#include "../lttng-clock.h"
-#include "percpu-defs.h"
-#include "random.h"
+#include <lttng-kernel-version.h>
+#include <lttng-clock.h>
+#include <wrapper/percpu-defs.h>
+#include <wrapper/random.h>
 
 #if ((LTTNG_KERNEL_RANGE(3,10,0, 3,10,14) && !LTTNG_RHEL_KERNEL_RANGE(3,10,0,7,0, 3,10,14,0,0)) \
        || LTTNG_KERNEL_RANGE(3,11,0, 3,11,3))

diff --git a/wrapper/tracepoint.h b/wrapper/tracepoint.h
index d094f42ac3695fafa6593f63780410b1734bb8e5..023086e42d59b4f82acfb6c7f5d77300a71edae9 100644 (file)
--- a/wrapper/tracepoint.h
+++ b/wrapper/tracepoint.h
@@ -42,7 +42,7 @@
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0))
 
-#include "../lttng-tracepoint.h"
+#include <lttng-tracepoint.h>
 
 #define lttng_wrapper_tracepoint_probe_register lttng_tracepoint_probe_register
 #define lttng_wrapper_tracepoint_probe_unregister lttng_tracepoint_probe_unregister
@@ -68,7 +68,7 @@ void lttng_tracepoint_exit(void)
 #ifdef CONFIG_MODULE_SIG
 
 #include <linux/kallsyms.h>
-#include "kallsyms.h"
+#include <wrapper/kallsyms.h>
 
 static inline
 int wrapper_tracepoint_module_notify(struct notifier_block *nb,

diff --git a/wrapper/vmalloc.h b/wrapper/vmalloc.h
index cb755eefd0235e02e02aef4cfe1ac4187c5a43ea..dad8d4e34498426762a1d195ed0510f47248c26a 100644 (file)
--- a/wrapper/vmalloc.h
+++ b/wrapper/vmalloc.h
@@ -28,7 +28,7 @@
 #ifdef CONFIG_KALLSYMS
 
 #include <linux/kallsyms.h>
-#include "kallsyms.h"
+#include <wrapper/kallsyms.h>
 
 static inline
 void wrapper_vmalloc_sync_all(void)

diff --git a/wrapper/writeback.h b/wrapper/writeback.h
index 492cb75f94a5ac7a2e15c670ff33b559ed5c6dbe..3e8a9f561c57b7d0c94fa9acea8624773a5ef978 100644 (file)
--- a/wrapper/writeback.h
+++ b/wrapper/writeback.h
@@ -28,7 +28,7 @@
 #ifdef CONFIG_KALLSYMS_ALL
 
 #include <linux/kallsyms.h>
-#include "kallsyms.h"
+#include <wrapper/kallsyms.h>
 
 static unsigned long *global_dirty_limit_sym;