Rename symbols.h to vmalloc.h

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

diff --git a/lib/ringbuffer/ring_buffer_backend.c b/lib/ringbuffer/ring_buffer_backend.c
index 2d272c773ef57e670d105268b715f59b953fa8bf..2ddb9f991bc9cc763e9008c8237683ba38edb542 100644 (file)
--- a/lib/ringbuffer/ring_buffer_backend.c
+++ b/lib/ringbuffer/ring_buffer_backend.c
@@ -16,7 +16,7 @@
 #include <linux/cpu.h>
 #include <linux/mm.h>
 
-#include "../../wrapper/symbols.h"     /* for wrapper_vmalloc_sync_all() */
+#include "../../wrapper/vmalloc.h"     /* for wrapper_vmalloc_sync_all() */
 #include "../../wrapper/ringbuffer/config.h"
 #include "../../wrapper/ringbuffer/backend.h"
 #include "../../wrapper/ringbuffer/frontend.h"

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index 4319ef3fbac635f38279f8b21d86ce2c167b1680..afee47c99f4dbf3bfb9ff706cdd980f48d88b9a4 100644 (file)
--- a/ltt-debugfs-abi.c
+++ b/ltt-debugfs-abi.c
@@ -28,7 +28,7 @@
 #include <linux/file.h>
 #include <linux/uaccess.h>
 #include <linux/slab.h>
-#include "wrapper/symbols.h"   /* for wrapper_vmalloc_sync_all() */
+#include "wrapper/vmalloc.h"   /* for wrapper_vmalloc_sync_all() */
 #include "wrapper/ringbuffer/vfs.h"
 #include "ltt-debugfs-abi.h"
 #include "ltt-events.h"

diff --git a/ltt-events.c b/ltt-events.c
index 9eb2c2f2ef838998e7eedb3fee14f0dddc7b9aa2..512e7a24676214e09063a35566cef322eca8644a 100644 (file)
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -11,7 +11,7 @@
 #include <linux/mutex.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include "wrapper/symbols.h"   /* for wrapper_vmalloc_sync_all() */
+#include "wrapper/vmalloc.h"   /* for wrapper_vmalloc_sync_all() */
 #include "ltt-events.h"
 
 static LIST_HEAD(sessions);

diff --git a/ltt-ring-buffer-client.h b/ltt-ring-buffer-client.h
index 00cac1608a341c980a89939e230d88d5f6461a89..219f69be239e67a41a025a90f80d1b055c7694b5 100644 (file)
--- a/ltt-ring-buffer-client.h
+++ b/ltt-ring-buffer-client.h
@@ -10,7 +10,7 @@
 
 #include <linux/module.h>
 #include <linux/types.h>
-#include "wrapper/symbols.h"   /* for wrapper_vmalloc_sync_all() */
+#include "wrapper/vmalloc.h"   /* for wrapper_vmalloc_sync_all() */
 #include "wrapper/trace-clock.h"
 #include "ltt-events.h"
 #include "ltt-tracer.h"

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index f697eadc1897d025a16e60b232b317a0f5bc778b..f031d450e3f29ca4009d576bd4b8bda9068571b7 100644 (file)
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -1,7 +1,7 @@
 #include <lttng.h>
 #include <lttng-types.h>
 #include <linux/debugfs.h>
-#include "../wrapper/symbols.h"        /* for wrapper_vmalloc_sync_all() */
+#include "../wrapper/vmalloc.h"        /* for wrapper_vmalloc_sync_all() */
 #include "../wrapper/ringbuffer/frontend_types.h"
 #include "../ltt-events.h"
 #include "../ltt-tracer-core.h"

diff --git a/probes/lttng-types.c b/probes/lttng-types.c
index 7f9d20e5fd64cad8c04f2206c688996a32c1daa4..c447b7de8b3238d4d6dca53ea4799c914b9d7ad6 100644 (file)
--- a/probes/lttng-types.c
+++ b/probes/lttng-types.c
@@ -11,7 +11,7 @@
 #include <linux/seq_file.h>
 #include <linux/jbd.h> /* tid_t */
 #include <linux/debugfs.h>
-#include "../wrapper/symbols.h"        /* for wrapper_vmalloc_sync_all() */
+#include "../wrapper/vmalloc.h"        /* for wrapper_vmalloc_sync_all() */
 #include "lttng-types.h"
 
 struct dentry *lttng_types_dentry;

diff --git a/wrapper/symbols.h b/wrapper/symbols.h
deleted file mode 100644 (file)
index 523f553..0000000
--- a/wrapper/symbols.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
- *
- * wrapper around vmalloc_sync_all. Using KALLSYMS to get its address when
- * available, else we need to have a kernel that exports this function to GPL
- * modules.
- *
- * Dual LGPL v2.1/GPL v2 license.
- */
-
-#ifdef CONFIG_KALLSYMS
-
-#include <linux/kallsyms.h>
-
-static inline
-void wrapper_vmalloc_sync_all(void)
-{
-       void (*vmalloc_sync_all_sym)(void);
-
-       vmalloc_sync_all_sym = (void *) kallsyms_lookup_name("vmalloc_sync_all");
-       if (vmalloc_sync_all_sym) {
-               vmalloc_sync_all_sym();
-       } else {
-#ifdef CONFIG_X86
-               /*
-                * Only x86 needs vmalloc_sync_all to make sure LTTng does not
-                * trigger recursive page faults.
-                */
-               printk(KERN_WARNING "LTTng: vmalloc_sync_all symbol lookup failed.\n");
-               printk(KERN_WARNING "Page fault handler and NMI tracing might trigger faults.\n");
-#endif
-       }
-}
-#else
-
-#include <linux/vmalloc.h>
-
-static inline
-void wrapper_vmalloc_sync_all(void)
-{
-       return vmalloc_sync_all();
-}
-#endif

diff --git a/wrapper/vmalloc.h b/wrapper/vmalloc.h
new file mode 100644 (file)
index 0000000..7d87855
--- /dev/null
+++ b/wrapper/vmalloc.h
@@ -0,0 +1,48 @@
+#ifndef _LTT_WRAPPER_VMALLOC_H
+#define _LTT_WRAPPER_VMALLOC_H
+
+/*
+ * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+ *
+ * wrapper around vmalloc_sync_all. Using KALLSYMS to get its address when
+ * available, else we need to have a kernel that exports this function to GPL
+ * modules.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
+ */
+
+#ifdef CONFIG_KALLSYMS
+
+#include <linux/kallsyms.h>
+
+static inline
+void wrapper_vmalloc_sync_all(void)
+{
+       void (*vmalloc_sync_all_sym)(void);
+
+       vmalloc_sync_all_sym = (void *) kallsyms_lookup_name("vmalloc_sync_all");
+       if (vmalloc_sync_all_sym) {
+               vmalloc_sync_all_sym();
+       } else {
+#ifdef CONFIG_X86
+               /*
+                * Only x86 needs vmalloc_sync_all to make sure LTTng does not
+                * trigger recursive page faults.
+                */
+               printk(KERN_WARNING "LTTng: vmalloc_sync_all symbol lookup failed.\n");
+               printk(KERN_WARNING "Page fault handler and NMI tracing might trigger faults.\n");
+#endif
+       }
+}
+#else
+
+#include <linux/vmalloc.h>
+
+static inline
+void wrapper_vmalloc_sync_all(void)
+{
+       return vmalloc_sync_all();
+}
+#endif
+
+#endif /* _LTT_WRAPPER_VMALLOC_H */