From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 13 Apr 2020 18:10:19 +0000 (-0400)
Subject: wrapper: remove irq wrapper
X-Git-Tag: for-upstreaming-review-1~94
X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=commitdiff_plain;h=88eb3d8e0c047374f61845400edd268afff93a44

wrapper: remove irq wrapper
---

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index eefc0b8f..52f7c48b 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -33,18 +33,14 @@
 #include <linux/mutex.h>
 #include <linux/device.h>
 #include <linux/fdtable.h>
+#include <linux/irq.h>
 
 #include <lttng-events.h>
 #include <lttng-tracer.h>
 #include <wrapper/namespace.h>
-#include <wrapper/irq.h>
 #include <wrapper/genhd.h>
 #include <wrapper/file.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/lttng-module
@@ -334,8 +330,6 @@ int lttng_enumerate_vm_maps(struct lttng_session *session)
 }
 #endif
 
-#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-
 static
 int lttng_list_interrupts(struct lttng_session *session)
 {
@@ -360,13 +354,6 @@ int lttng_list_interrupts(struct lttng_session *session)
 	}
 	return 0;
 }
-#else
-static inline
-int lttng_list_interrupts(struct lttng_session *session)
-{
-	return 0;
-}
-#endif
 
 /*
  * Statedump the task's namespaces using the proc filesystem inode number as
diff --git a/wrapper/irq.h b/wrapper/irq.h
deleted file mode 100644
index 0b7913d9..00000000
--- a/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 <linux/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 (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0) \
-	|| defined(CONFIG_GENERIC_HARDIRQS))
-# define CONFIG_LTTNG_HAS_LIST_IRQ
-#endif
-
-#endif /* _LTTNG_WRAPPER_IRQ_H */