The patch titled
reintegrate irqreturn.h into hardirq.h
has been added to the -mm tree. Its filename is
reintegrate-irqreturnh-into-hardirqh.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: reintegrate irqreturn.h into hardirq.h
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>
We already have enough mini header files and moving these definitions to
hardirq.h works just fine.
Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/hardirq.h | 20 ++++++++++++++++++++
include/linux/interrupt.h | 1 -
include/linux/irq.h | 3 +--
include/linux/irqreturn.h | 25 -------------------------
4 files changed, 21 insertions(+), 28 deletions(-)
diff -puN include/linux/hardirq.h~reintegrate-irqreturnh-into-hardirqh include/linux/hardirq.h
--- a/include/linux/hardirq.h~reintegrate-irqreturnh-into-hardirqh
+++ a/include/linux/hardirq.h
@@ -7,6 +7,26 @@
#include <asm/system.h>
/*
+ * For 2.4.x compatibility, 2.4.x can use
+ *
+ * typedef void irqreturn_t;
+ * #define IRQ_NONE
+ * #define IRQ_HANDLED
+ * #define IRQ_RETVAL(x)
+ *
+ * To mix old-style and new-style irq handler returns.
+ *
+ * IRQ_NONE means we didn't handle it.
+ * IRQ_HANDLED means that we did have a valid interrupt and handled it.
+ * IRQ_RETVAL(x) selects on the two depending on x being non-zero (for handled)
+ */
+typedef int irqreturn_t;
+
+#define IRQ_NONE (0)
+#define IRQ_HANDLED (1)
+#define IRQ_RETVAL(x) ((x) != 0)
+
+/*
* We put the hardirq and softirq counter into the preemption
* counter. The bitmask has the following meaning:
*
diff -puN include/linux/interrupt.h~reintegrate-irqreturnh-into-hardirqh include/linux/interrupt.h
--- a/include/linux/interrupt.h~reintegrate-irqreturnh-into-hardirqh
+++ a/include/linux/interrupt.h
@@ -7,7 +7,6 @@
#include <linux/bitops.h>
#include <linux/preempt.h>
#include <linux/cpumask.h>
-#include <linux/irqreturn.h>
#include <linux/hardirq.h>
#include <linux/sched.h>
#include <asm/atomic.h>
diff -puN include/linux/irq.h~reintegrate-irqreturnh-into-hardirqh include/linux/irq.h
--- a/include/linux/irq.h~reintegrate-irqreturnh-into-hardirqh
+++ a/include/linux/irq.h
@@ -17,7 +17,6 @@
#include <linux/cache.h>
#include <linux/spinlock.h>
#include <linux/cpumask.h>
-#include <linux/irqreturn.h>
#include <asm/irq.h>
#include <asm/ptrace.h>
@@ -177,7 +176,7 @@ static inline void set_balance_irq_affin
extern int no_irq_affinity;
extern int noirqdebug_setup(char *str);
-extern fastcall irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
+extern fastcall int handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
struct irqaction *action);
extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs);
extern void note_interrupt(unsigned int irq, irq_desc_t *desc,
diff -puN include/linux/irqreturn.h~reintegrate-irqreturnh-into-hardirqh /dev/null
--- a/include/linux/irqreturn.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* irqreturn.h */
-#ifndef _LINUX_IRQRETURN_H
-#define _LINUX_IRQRETURN_H
-
-/*
- * For 2.4.x compatibility, 2.4.x can use
- *
- * typedef void irqreturn_t;
- * #define IRQ_NONE
- * #define IRQ_HANDLED
- * #define IRQ_RETVAL(x)
- *
- * To mix old-style and new-style irq handler returns.
- *
- * IRQ_NONE means we didn't handle it.
- * IRQ_HANDLED means that we did have a valid interrupt and handled it.
- * IRQ_RETVAL(x) selects on the two depending on x being non-zero (for handled)
- */
-typedef int irqreturn_t;
-
-#define IRQ_NONE (0)
-#define IRQ_HANDLED (1)
-#define IRQ_RETVAL(x) ((x) != 0)
-
-#endif
_
Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are
origin.patch
git-kbuild.patch
64-bit-resources-kconfig-change.patch
affs_fill_super-%s-abuses-2.patch
reintegrate-irqreturnh-into-hardirqh.patch
time-use-clocksource-abstraction-for-ntp-adjustments-optimize-out-some-mults-since-gcc-cant-avoid-them.patch
time-rename-clocksource-functions.patch
fix-and-optimize-clock-source-update.patch
fix-rt-mutex-defaults-and-dependencies.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
