wrapper: Remove irqdesc wrapper

diff --git a/Makefile b/Makefile
index ebd355c7f575e908fd51d4434f443f63bd1b5496..4ae26b41a9d0f9e036b97e4feb4b01c598f38a63 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ ifneq ($(KERNELRELEASE),)
   endif
 
   obj-$(CONFIG_LTTNG) += lttng-statedump.o
-  lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
+  lttng-statedump-objs := lttng-statedump-impl.o \
                           wrapper/fdtable.o
 
   obj-$(CONFIG_LTTNG) += probes/

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index 9dc0eb199f90c4c61048223ba58dff651a815e47..ace81a3d42cff080bab7b858161e5107abaf8897 100644 (file)
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -35,7 +35,6 @@
 
 #include <lttng-events.h>
 #include <lttng-tracer.h>
-#include <wrapper/irqdesc.h>
 #include <wrapper/fdtable.h>
 #include <wrapper/namespace.h>
 #include <wrapper/irq.h>
@@ -346,7 +345,6 @@ int lttng_list_interrupts(struct lttng_session *session)
        unsigned long flags = 0;
        struct irq_desc *desc;
 
-#define irq_to_desc    wrapper_irq_to_desc
        /* needs irq_desc */
        for_each_irq_desc(irq, desc) {
                struct irqaction *action;
@@ -363,7 +361,6 @@ int lttng_list_interrupts(struct lttng_session *session)
                local_irq_restore(flags);
        }
        return 0;
-#undef irq_to_desc
 }
 #else
 static inline

diff --git a/wrapper/irqdesc.c b/wrapper/irqdesc.c
deleted file mode 100644 (file)
index a85a855..0000000
--- a/wrapper/irqdesc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* 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. This export was added to the 3.4 kernels.
- *
- * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#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 <wrapper/kallsyms.h>
-#include <wrapper/irqdesc.h>
-
-static
-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");
-       if (irq_to_desc_sym) {
-               return irq_to_desc_sym(irq);
-       } else {
-               printk_once(KERN_WARNING "LTTng: irq_to_desc symbol lookup failed.\n");
-               return NULL;
-       }
-}
-
-#else
-
-#include <linux/interrupt.h>
-#include <linux/irqnr.h>
-
-struct irq_desc *wrapper_irq_to_desc(unsigned int irq)
-{
-       return irq_to_desc(irq);
-}
-
-#endif

diff --git a/wrapper/irqdesc.h b/wrapper/irqdesc.h
deleted file mode 100644 (file)
index d203230..0000000
--- a/wrapper/irqdesc.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/irqdesc.h
- *
- * 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.
- *
- * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_IRQDESC_H
-#define _LTTNG_WRAPPER_IRQDESC_H
-
-#include <linux/interrupt.h>
-#include <linux/irqnr.h>
-
-struct irq_desc *wrapper_irq_to_desc(unsigned int irq);
-
-#endif /* _LTTNG_WRAPPER_IRQDESC_H */