From 74019c61b437c21b11b7190800ca8ab859042f6c Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 18 Nov 2022 11:57:22 -0500
Subject: [PATCH] Drop 'linux/irq.h' wrapper

Change-Id: Idaebcb77e3cad262661385234fba284fa03676a9
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 include/wrapper/irq.h      | 25 -------------------------
 src/lttng-statedump-impl.c | 15 +--------------
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 include/wrapper/irq.h

diff --git a/include/wrapper/irq.h b/include/wrapper/irq.h
deleted file mode 100644
index ea4385e5..00000000
--- a/include/wrapper/irq.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/irq.h
- *
- * wrapper around linux/irq.h.
- *
- * Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_IRQ_H
-#define _LTTNG_WRAPPER_IRQ_H
-
-#include <lttng/kernel-version.h>
-
-/*
- * Starting from the 3.12 Linux kernel, all architectures use the
- * generic hard irqs system. More details can be seen at commit
- * 0244ad004a54e39308d495fee0a2e637f8b5c317 in the Linux kernel GIT.
- */
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,0) \
-	|| defined(CONFIG_GENERIC_HARDIRQS))
-# define CONFIG_LTTNG_HAS_LIST_IRQ
-#endif
-
-#endif /* _LTTNG_WRAPPER_IRQ_H */
diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c
index 6cd97658..95032f87 100644
--- a/src/lttng-statedump-impl.c
+++ b/src/lttng-statedump-impl.c
@@ -22,6 +22,7 @@
 #include <linux/proc_fs.h>
 #include <linux/file.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/irqnr.h>
 #include <linux/netdevice.h>
 #include <linux/inetdevice.h>
@@ -39,16 +40,11 @@
 #include <wrapper/irqdesc.h>
 #include <wrapper/fdtable.h>
 #include <wrapper/namespace.h>
-#include <wrapper/irq.h>
 #include <wrapper/tracepoint.h>
 #include <wrapper/blkdev.h>
 #include <wrapper/fdtable.h>
 #include <wrapper/sched.h>
 
-#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-#include <linux/irq.h>
-#endif
-
 /* Define the tracepoints, but do not build the probes */
 #define CREATE_TRACE_POINTS
 #define TRACE_INCLUDE_PATH instrumentation/events
@@ -533,8 +529,6 @@ int lttng_enumerate_vm_maps(struct lttng_kernel_session *session)
 }
 #endif
 
-#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-
 static
 int lttng_list_interrupts(struct lttng_kernel_session *session)
 {
@@ -561,13 +555,6 @@ int lttng_list_interrupts(struct lttng_kernel_session *session)
 	return 0;
 #undef irq_to_desc
 }
-#else
-static inline
-int lttng_list_interrupts(struct lttng_kernel_session *session)
-{
-	return 0;
-}
-#endif
 
 /*
  * Statedump the task's namespaces using the proc filesystem inode number as
-- 
2.34.1