From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 15 Mar 2016 15:45:00 +0000 (-0400)
Subject: Use system include path in wrappers
X-Git-Tag: v2.8.0-rc1~7
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5a2f5e92e422d87a28581ba97e6b1789ff743bc6;p=lttng-modules.git

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 a44beb55..ef39ba63 100644
--- 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 064f9c7c..6fd1d55c 100644
--- 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 5bb390b6..4184bd01 100644
--- 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 889fcd03..6ef86c2d 100644
--- 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 a26f136f..dc1fbed2 100644
--- 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 7802a12a..3a522a9d 100644
--- 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 5b88f7ed..5151f9a9 100644
--- 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 81d7995c..d3a94878 100644
--- 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 8c4cd744..2fc60b13 100644
--- 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 0ef8dd99..357e1ac5 100644
--- 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 1b7a2176..23869ca8 100644
--- 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 d6439c7f..efb49f4c 100644
--- 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 d094f42a..023086e4 100644
--- 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 cb755eef..dad8d4e3 100644
--- 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 492cb75f..3e8a9f56 100644
--- 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;