The patch titled
genirq: allow usage of no_irq_chip
has been added to the -mm tree. Its filename is
genirq-allow-usage-of-no_irq_chip.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: genirq: allow usage of no_irq_chip
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Some dumb interrupt hardware has no way to ack/mask.... Instead of
creating a seperate chip structure we allow to reuse the already existing
no_irq_chip
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/irq/handle.c | 9 +++++++--
kernel/irq/manage.c | 2 +-
kernel/irq/proc.c | 5 ++---
3 files changed, 10 insertions(+), 6 deletions(-)
diff -puN kernel/irq/handle.c~genirq-allow-usage-of-no_irq_chip kernel/irq/handle.c
--- a/kernel/irq/handle.c~genirq-allow-usage-of-no_irq_chip
+++ a/kernel/irq/handle.c
@@ -62,8 +62,12 @@ struct irq_desc irq_desc[NR_IRQS] __cach
*/
static void ack_bad(unsigned int irq)
{
- print_irq_desc(irq, irq_desc + irq);
- ack_bad_irq(irq);
+ struct irq_desc *desc = irq_desc + irq;
+
+ if (desc->handle_irq == handle_bad_irq) {
+ print_irq_desc(irq, desc);
+ ack_bad_irq(irq);
+ }
}
/*
@@ -88,6 +92,7 @@ struct irq_chip no_irq_chip = {
.enable = noop,
.disable = noop,
.ack = ack_bad,
+ .unmask = noop,
.end = noop,
};
diff -puN kernel/irq/manage.c~genirq-allow-usage-of-no_irq_chip kernel/irq/manage.c
--- a/kernel/irq/manage.c~genirq-allow-usage-of-no_irq_chip
+++ a/kernel/irq/manage.c
@@ -199,7 +199,7 @@ int setup_irq(unsigned int irq, struct i
if (irq >= NR_IRQS)
return -EINVAL;
- if (desc->chip == &no_irq_chip)
+ if (desc->handle_irq == &handle_bad_irq)
return -ENOSYS;
/*
* Some drivers like serial.c use request_irq() heavily,
diff -puN kernel/irq/proc.c~genirq-allow-usage-of-no_irq_chip kernel/irq/proc.c
--- a/kernel/irq/proc.c~genirq-allow-usage-of-no_irq_chip
+++ a/kernel/irq/proc.c
@@ -116,9 +116,8 @@ void register_irq_proc(unsigned int irq)
{
char name [MAX_NAMELEN];
- if (!root_irq_dir ||
- (irq_desc[irq].chip == &no_irq_chip) ||
- irq_desc[irq].dir)
+ if (!root_irq_dir || (irq_desc[irq].handle_irq == &handle_bad_irq) ||
+ irq_desc[irq].dir)
return;
memset(name, 0, MAX_NAMELEN);
_
Patches currently in -mm which might be from tglx@xxxxxxxxxxxxx are
git-mtd.patch
pi-futex-futex-code-cleanups.patch
pi-futex-introduce-debug_check_no_locks_freed.patch
pi-futex-add-plist-implementation.patch
pi-futex-scheduler-support-for-pi.patch
pi-futex-rt-mutex-core.patch
pi-futex-rt-mutex-docs.patch
pi-futex-rt-mutex-debug.patch
pi-futex-rt-mutex-tester.patch
pi-futex-rt-mutex-futex-api.patch
pi-futex-futex_lock_pi-futex_unlock_pi-support.patch
fix-rt-mutex-defaults-and-dependencies.patch
futex_requeue-optimization.patch
genirq-rename-desc-handler-to-desc-chip.patch
genirq-sem2mutex-probe_sem-probing_active.patch
genirq-cleanup-merge-irq_affinity-into-irq_desc.patch
genirq-cleanup-remove-irq_descp.patch
genirq-cleanup-remove-fastcall.patch
genirq-cleanup-misc-code-cleanups.patch
genirq-cleanup-reduce-irq_desc_t-use-mark-it-obsolete.patch
genirq-cleanup-include-linux-irqh.patch
genirq-cleanup-merge-irq_dir-smp_affinity_entry-into-irq_desc.patch
genirq-cleanup-merge-pending_irq_cpumask-into-irq_desc.patch
genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu.patch
genirq-debug-better-debug-printout-in-enable_irq.patch
genirq-add-retrigger-irq-op-to-consolidate-hw_irq_resend.patch
genirq-doc-comment-include-linux-irqh-structures.patch
genirq-doc-handle_irq_event-and-__do_irq-comments.patch
genirq-cleanup-no_irq_type-cleanups.patch
genirq-doc-add-design-documentation.patch
genirq-add-genirq-sw-irq-retrigger.patch
genirq-add-irq_noprobe-support.patch
genirq-add-irq_norequest-support.patch
genirq-add-irq_noautoen-support.patch
genirq-update-copyrights.patch
genirq-core.patch
genirq-msi-fixes-2.patch
genirq-add-irq-chip-support.patch
genirq-add-irq-chip-support-fix.patch
genirq-add-handle_bad_irq.patch
genirq-add-irq-wake-power-management-support.patch
genirq-add-sa_trigger-support.patch
genirq-convert-the-x86_64-architecture-to-irq-chips.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-convert-the-i386-architecture-to-irq-chips-fix-2.patch
genirq-more-verbose-debugging-on-unexpected-irq-vectors.patch
genirq-add-chip-eoi-fastack-fasteoi-fix.patch
genirq-allow-usage-of-no_irq_chip.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
