The patch titled
m68k: cleanup generic irq names
has been added to the -mm tree. Its filename is
m68k-cleanup-generic-irq-names.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: m68k: cleanup generic irq names
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Rename IRQ1..IRQ7 to IRQ_AUTO_1..IRQ_AUTO_7 and remove the duplicate
defintions.
Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/m68k/kernel/ints.c | 4 ++--
arch/m68k/q40/q40ints.c | 4 ++--
drivers/net/sun3lance.c | 2 +-
include/asm-m68k/atariints.h | 11 -----------
include/asm-m68k/irq.h | 22 ++++++++++------------
include/asm-m68k/macints.h | 11 -----------
6 files changed, 15 insertions(+), 39 deletions(-)
diff -puN arch/m68k/kernel/ints.c~m68k-cleanup-generic-irq-names arch/m68k/kernel/ints.c
--- a/arch/m68k/kernel/ints.c~m68k-cleanup-generic-irq-names
+++ a/arch/m68k/kernel/ints.c
@@ -153,7 +153,7 @@ int cpu_request_irq(unsigned int irq,
irqreturn_t (*handler)(int, void *, struct pt_regs *),
unsigned long flags, const char *devname, void *dev_id)
{
- if (irq < IRQ1 || irq > IRQ7) {
+ if (irq < IRQ_AUTO_1 || irq > IRQ_AUTO_7) {
printk("%s: Incorrect IRQ %d from %s\n",
__FUNCTION__, irq, devname);
return -ENXIO;
@@ -183,7 +183,7 @@ int cpu_request_irq(unsigned int irq,
void cpu_free_irq(unsigned int irq, void *dev_id)
{
- if (irq < IRQ1 || irq > IRQ7) {
+ if (irq < IRQ_AUTO_1 || irq > IRQ_AUTO_7) {
printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
return;
}
diff -puN arch/m68k/q40/q40ints.c~m68k-cleanup-generic-irq-names arch/m68k/q40/q40ints.c
--- a/arch/m68k/q40/q40ints.c~m68k-cleanup-generic-irq-names
+++ a/arch/m68k/q40/q40ints.c
@@ -93,8 +93,8 @@ void q40_init_IRQ (void)
}
/* setup handler for ISA ints */
- cpu_request_irq(IRQ2, q40_irq2_handler, 0, "q40 ISA and master chip",
- NULL);
+ cpu_request_irq(IRQ_AUTO_2, q40_irq2_handler, 0,
+ "q40 ISA and master chip", NULL);
/* now enable some ints.. */
master_outb(1,EXT_ENABLE_REG); /* ISA IRQ 5-15 */
diff -puN drivers/net/sun3lance.c~m68k-cleanup-generic-irq-names drivers/net/sun3lance.c
--- a/drivers/net/sun3lance.c~m68k-cleanup-generic-irq-names
+++ a/drivers/net/sun3lance.c
@@ -55,7 +55,7 @@ static char *version = "sun3lance.c: v1.
/* sun3/60 addr/irq for the lance chip. If your sun is different,
change this. */
#define LANCE_OBIO 0x120000
-#define LANCE_IRQ IRQ3
+#define LANCE_IRQ IRQ_AUTO_3
/* Debug level:
* 0 = silent, print only serious errors
diff -puN include/asm-m68k/atariints.h~m68k-cleanup-generic-irq-names include/asm-m68k/atariints.h
--- a/include/asm-m68k/atariints.h~m68k-cleanup-generic-irq-names
+++ a/include/asm-m68k/atariints.h
@@ -45,17 +45,6 @@
#define IRQ_TYPE_FAST 1
#define IRQ_TYPE_PRIO 2
-#define IRQ_SPURIOUS (0)
-
-/* auto-vector interrupts */
-#define IRQ_AUTO_1 (1)
-#define IRQ_AUTO_2 (2)
-#define IRQ_AUTO_3 (3)
-#define IRQ_AUTO_4 (4)
-#define IRQ_AUTO_5 (5)
-#define IRQ_AUTO_6 (6)
-#define IRQ_AUTO_7 (7)
-
/* ST-MFP interrupts */
#define IRQ_MFP_BUSY (8)
#define IRQ_MFP_DCD (9)
diff -puN include/asm-m68k/irq.h~m68k-cleanup-generic-irq-names include/asm-m68k/irq.h
--- a/include/asm-m68k/irq.h~m68k-cleanup-generic-irq-names
+++ a/include/asm-m68k/irq.h
@@ -4,7 +4,7 @@
#include <linux/interrupt.h>
/*
- * # of m68k interrupts
+ * # of m68k auto vector interrupts
*/
#define SYS_IRQS 8
@@ -40,19 +40,17 @@
* that routine requires service.
*/
-#define IRQ1 (1) /* level 1 interrupt */
-#define IRQ2 (2) /* level 2 interrupt */
-#define IRQ3 (3) /* level 3 interrupt */
-#define IRQ4 (4) /* level 4 interrupt */
-#define IRQ5 (5) /* level 5 interrupt */
-#define IRQ6 (6) /* level 6 interrupt */
-#define IRQ7 (7) /* level 7 interrupt (non-maskable) */
+#define IRQ_SPURIOUS 0
-/*
- * "Generic" interrupt sources
- */
+#define IRQ_AUTO_1 1 /* level 1 interrupt */
+#define IRQ_AUTO_2 2 /* level 2 interrupt */
+#define IRQ_AUTO_3 3 /* level 3 interrupt */
+#define IRQ_AUTO_4 4 /* level 4 interrupt */
+#define IRQ_AUTO_5 5 /* level 5 interrupt */
+#define IRQ_AUTO_6 6 /* level 6 interrupt */
+#define IRQ_AUTO_7 7 /* level 7 interrupt (non-maskable) */
-#define IRQ_SCHED_TIMER (8) /* interrupt source for scheduling timer */
+#define IRQ_USER 8
static __inline__ int irq_canonicalize(int irq)
{
diff -puN include/asm-m68k/macints.h~m68k-cleanup-generic-irq-names include/asm-m68k/macints.h
--- a/include/asm-m68k/macints.h~m68k-cleanup-generic-irq-names
+++ a/include/asm-m68k/macints.h
@@ -59,17 +59,6 @@
#define IRQ_SRC(irq) (irq >> 3)
#define IRQ_IDX(irq) (irq & 7)
-#define IRQ_SPURIOUS (0)
-
-/* auto-vector interrupts */
-#define IRQ_AUTO_1 (1)
-#define IRQ_AUTO_2 (2)
-#define IRQ_AUTO_3 (3)
-#define IRQ_AUTO_4 (4)
-#define IRQ_AUTO_5 (5)
-#define IRQ_AUTO_6 (6)
-#define IRQ_AUTO_7 (7)
-
/* VIA1 interrupts */
#define IRQ_VIA1_0 (8) /* one second int. */
#define IRQ_VIA1_1 (9) /* VBlank int. */
_
Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are
origin.patch
git-kbuild.patch
64-bit-resources-kconfig-change.patch
m68k-fix-uaccessh-for-gcc-3x.patch
m68k-fix-constraints-of-the-signal-functions-and-some-cleanup.patch
m68k-fix-__iounmap-for-030.patch
m68k-small-flush_icache-cleanup.patch
m68k-add-the-generic-dma-api-functions.patch
m68k-dma-api-addition.patch
m68k-fix-show_registers.patch
m68k-separate-handler-for-auto-and-user-vector-interrupt.patch
m68k-cleanup-generic-irq-names.patch
m68k-cleanup-amiga-irq-numbering.patch
m68k-introduce-irq-controller.patch
m68k-convert-generic-irq-code-to-irq-controller.patch
m68k-convert-amiga-irq-code.patch
m68k-convert-apollo-irq-code.patch
m68k-convert-atari-irq-code.patch
m68k-convert-hp300-irq-code.patch
m68k-convert-mac-irq-code.patch
m68k-convert-q40-irq-code.patch
m68k-convert-sun3-irq-code.patch
m68k-convert-vme-irq-code.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
