From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 2 Mar 2020 15:52:54 +0000 (-0500)
Subject: Remove dependency on kallsyms for irq_to_desc (kernel 3.4+)
X-Git-Tag: v2.12.0-rc3~6
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a47f2a37282a08868611a307041bbc131d78e8dc;p=lttng-modules.git

Remove dependency on kallsyms for irq_to_desc (kernel 3.4+)

Upstream commit 3911ff30f5d "genirq: export handle_edge_irq() and
irq_to_desc()" exported the irq_to_desc symbol, so use it to remove a
dependency on kallsyms_lookup_name().

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/wrapper/irqdesc.c b/wrapper/irqdesc.c
index 1d6e2890..29427d47 100644
--- a/wrapper/irqdesc.c
+++ b/wrapper/irqdesc.c
@@ -4,12 +4,15 @@
  *
  * 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>