X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Firqdesc.c;h=365b6e1111016517533a4e08f69c458691273a90;hb=1c999280e7f232e6c2e41d8c76020e795a649648;hp=6ef86c2d5416b7e63c746babb843640f9c4a9060;hpb=5a2f5e92e422d87a28581ba97e6b1789ff743bc6;p=lttng-modules.git

diff --git a/wrapper/irqdesc.c b/wrapper/irqdesc.c
index 6ef86c2d..365b6e11 100644
--- a/wrapper/irqdesc.c
+++ b/wrapper/irqdesc.c
@@ -1,28 +1,18 @@
-/*
+/* 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>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#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>
@@ -36,14 +26,15 @@ 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 {
-		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
 
@@ -54,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