The patch titled
genirq-rename-desc-handler-to-desc-chip-ia64-fix
has been removed from the -mm tree. Its filename is
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
This patch was dropped because it was folded into genirq-rename-desc-handler-to-desc-chip.patch
------------------------------------------------------
Subject: genirq-rename-desc-handler-to-desc-chip-ia64-fix
From: Andrew Morton <akpm@xxxxxxxx>
arch/ia64/kernel/iosapic.c: In function `register_intr':
arch/ia64/kernel/iosapic.c:663: error: structure has no member named `handler' arch/ia64/kernel/iosapic.c:664: error: structure has no member named `handler'
arch/ia64/kernel/iosapic.c:668: error: structure has no member named `handler'
arch/ia64/kernel/iosapic.c:669: error: structure has no member named `handler' arch/ia64/kernel/iosapic.c: In function `iosapic_unregister_intr':
arch/ia64/kernel/iosapic.c:906: error: structure has no member named `handler'
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/ia64/kernel/iosapic.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff -puN arch/ia64/kernel/iosapic.c~genirq-rename-desc-handler-to-desc-chip-ia64-fix arch/ia64/kernel/iosapic.c
--- 25/arch/ia64/kernel/iosapic.c~genirq-rename-desc-handler-to-desc-chip-ia64-fix Mon May 22 16:23:50 2006
+++ 25-akpm/arch/ia64/kernel/iosapic.c Mon May 22 16:24:56 2006
@@ -660,13 +660,13 @@ register_intr (unsigned int gsi, int vec
irq_type = &irq_type_iosapic_level;
idesc = irq_descp(vector);
- if (idesc->handler != irq_type) {
- if (idesc->handler != &no_irq_type)
+ if (idesc->chip != irq_type) {
+ if (idesc->chip != &no_irq_type)
printk(KERN_WARNING
"%s: changing vector %d from %s to %s\n",
__FUNCTION__, vector,
- idesc->handler->typename, irq_type->typename);
- idesc->handler = irq_type;
+ idesc->chip->typename, irq_type->typename);
+ idesc->chip = irq_type;
}
return 0;
}
@@ -903,7 +903,7 @@ iosapic_unregister_intr (unsigned int gs
BUG_ON(iosapic_intr_info[vector].count);
/* Clear the interrupt controller descriptor */
- idesc->handler = &no_irq_type;
+ idesc->chip = &no_irq_type;
/* Clear the interrupt information */
memset(&iosapic_intr_info[vector], 0,
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
generic_file_buffered_write-handle-zero-length-iovec-segments-stable.patch
sparc-register_cpu-build-fix.patch
ufs-printk-fix.patch
genirq-rename-desc-handler-to-desc-chip.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-cleanup-merge-irq_affinity-into-irq_desc-sparc64-fix.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
