X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=wrapper%2Firqdesc.c;h=365b6e1111016517533a4e08f69c458691273a90;hb=a65765406b03e4f3b7a4303e1c9ed83c86cdd358;hp=1d6e2890d395a4b5f189cf06a73aab67407fa41e;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git

diff --git a/wrapper/irqdesc.c b/wrapper/irqdesc.c
index 1d6e2890..365b6e11 100644
--- a/wrapper/irqdesc.c
+++ b/wrapper/irqdesc.c
@@ -1,15 +1,18 @@
-/* SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+/* SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only)
  *
  * 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.
  *
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#ifdef CONFIG_KALLSYMS
+#include <lttng-kernel-version.h>
+
+#if (defined(CONFIG_KALLSYMS) \
+	&& (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)))
 
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>
@@ -23,7 +26,7 @@ struct irq_desc *(*irq_to_desc_sym)(unsigned int irq);
 struct irq_desc *wrapper_irq_to_desc(unsigned int irq)
 {
 	if (!irq_to_desc_sym)
-		irq_to_desc_sym = (void *) kallsyms_lookup_funcptr("irq_to_desc"); 
+		irq_to_desc_sym = (void *) kallsyms_lookup_funcptr("irq_to_desc");
 	if (irq_to_desc_sym) {
 		return irq_to_desc_sym(irq);
 	} else {
@@ -31,6 +34,7 @@ struct irq_desc *wrapper_irq_to_desc(unsigned int irq)
 		return NULL;
 	}
 }
+EXPORT_SYMBOL_GPL(wrapper_irq_to_desc);
 
 #else
 
@@ -41,5 +45,6 @@ struct irq_desc *wrapper_irq_to_desc(unsigned int irq)
 {
 	return irq_to_desc(irq);
 }
+EXPORT_SYMBOL_GPL(wrapper_irq_to_desc);
 
 #endif