Fix: update kvm instrumentation for Ubuntu 4.15.0-92

[lttng-modules.git] / wrapper / irqdesc.c

diff --git a/wrapper/irqdesc.c b/wrapper/irqdesc.c
index 889fcd03d2e1257bf8aae152acf18cb32d1bad5d..47eda8995d5fb5095d87b832cbb13b38ac099ef2 100644 (file)
--- a/wrapper/irqdesc.c
+++ b/wrapper/irqdesc.c
@@ -3,7 +3,7 @@
  *
  * 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>
  *
@@ -22,13 +22,16 @@
  * 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>
 #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);
@@ -40,7 +43,7 @@ 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;
        }
 }