X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Firqdesc.c;h=02c44c8001abe3273fe54d9681ed6a91dbc386ad;hb=ad594e3a953db1b0c3c059fde45b5a5494f6be78;hp=a71981e74a4fdd74c4dc61b35d6563309df96eba;hpb=c337ddc219f608d4d35f461bdc9d2246324d6708;p=lttng-modules.git

diff --git a/wrapper/irqdesc.c b/wrapper/irqdesc.c
index a71981e7..02c44c80 100644
--- a/wrapper/irqdesc.c
+++ b/wrapper/irqdesc.c
@@ -1,20 +1,25 @@
-/*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+ *
+ * wrapper/irqdesc.c
  *
  * wrapper around irq_to_desc. Using KALLSYMS to get its address when
  * available, else we need to have a kernel that exports this function to GPL
- * modules.
+ * modules. This export was added to the 3.4 kernels.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#ifdef CONFIG_KALLSYMS
+#include <lttng-kernel-version.h>
+#include <linux/module.h>
+
+#if (defined(CONFIG_KALLSYMS) \
+	&& (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)))
 
 #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);
@@ -26,10 +31,11 @@ struct irq_desc *wrapper_irq_to_desc(unsigned int irq)
 	if (irq_to_desc_sym) {
 		return irq_to_desc_sym(irq);
 	} else {
-		printk(KERN_WARNING "LTTng: irq_to_desc symbol lookup failed.\n");
+		printk_once(KERN_WARNING "LTTng: irq_to_desc symbol lookup failed.\n");
 		return NULL;
 	}
 }
+EXPORT_SYMBOL_GPL(wrapper_irq_to_desc);
 
 #else
 
@@ -40,5 +46,6 @@ struct irq_desc *wrapper_irq_to_desc(unsigned int irq)
 {
 	return irq_to_desc(irq);
 }
+EXPORT_SYMBOL_GPL(wrapper_irq_to_desc);
 
 #endif