Namespace kernel version macros

[lttng-modules.git] / include / wrapper / uprobes.h

diff --git a/include/wrapper/uprobes.h b/include/wrapper/uprobes.h
index 8b745715ffcf17af51847f051b3f55a303f5e9c6..9cbbe3b2fdffd33a650a103e5510532f9b715d39 100644 (file)
--- a/include/wrapper/uprobes.h
+++ b/include/wrapper/uprobes.h
@@ -14,13 +14,13 @@
 #ifndef _LTTNG_WRAPPER_UPROBES_H
 #define _LTTNG_WRAPPER_UPROBES_H
 
-#include <linux/version.h>
+#include <lttng/kernel-version.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,5,0))
 #include <linux/uprobes.h>
 
 /* Use kallsym lookup for version before 3.9. */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0))
 
 static inline
 int wrapper_uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
@@ -88,9 +88,9 @@ void wrapper_uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe
  *   extern void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
  */
 static inline
-int __canary__uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
+void __canary__uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
 {
-       return uprobe_unregister(inode, offset, uc);
+       uprobe_unregister(inode, offset, uc);
 }
 
 #endif