From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 18 Jan 2021 19:25:49 +0000 (-0500)
Subject: fix: genirq: Restrict export of irq_to_desc() (v5.11)
X-Git-Tag: v2.12.5~15
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e12ef7eee8f880aa30eeb1998428282f1414bea5;p=lttng-modules.git

fix: genirq: Restrict export of irq_to_desc() (v5.11)

See upstream commit:

  commit 64a1b95bb9fe3ec76e1a2cd803eff06389341ae4
  Author: Thomas Gleixner <tglx@linutronix.de>
  Date:   Thu Dec 10 20:26:06 2020 +0100

    genirq: Restrict export of irq_to_desc()

    No more (ab)use in drivers finally. There is still the modular build of
    PPC/KVM which needs it, so restrict it to this case which still makes it
    unavailable for most drivers.

    Link: https://lore.kernel.org/r/20201210194045.551428291@linutronix.de

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ie5a2af2f02ade07c73e1c7a8aa0fb155280b3d8b
---

diff --git a/wrapper/irqdesc.c b/wrapper/irqdesc.c
index 02c44c80..d8858c43 100644
--- a/wrapper/irqdesc.c
+++ b/wrapper/irqdesc.c
@@ -4,7 +4,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. This export was added to the 3.4 kernels.
+ * modules. This export was added to the 3.4 kernels and removed in 5.11.
  *
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
@@ -12,8 +12,9 @@
 #include <lttng-kernel-version.h>
 #include <linux/module.h>
 
-#if (defined(CONFIG_KALLSYMS) \
-	&& (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)))
+#if (defined(CONFIG_KALLSYMS) && \
+	((LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0)) || \
+	 (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))))
 
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>