The patch titled
IRQ: warning message cleanup
has been removed from the -mm tree. Its filename is
irq-warning-message-cleanup.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: IRQ: warning message cleanup
From: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Make warnings more consistent.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/irq/manage.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff -puN kernel/irq/manage.c~irq-warning-message-cleanup kernel/irq/manage.c
--- a/kernel/irq/manage.c~irq-warning-message-cleanup
+++ a/kernel/irq/manage.c
@@ -114,7 +114,7 @@ void enable_irq(unsigned int irq)
spin_lock_irqsave(&desc->lock, flags);
switch (desc->depth) {
case 0:
- printk(KERN_WARNING "Unablanced enable_irq(%d)\n", irq);
+ printk(KERN_WARNING "Unbalanced enable for IRQ %d\n", irq);
WARN_ON(1);
break;
case 1: {
@@ -267,9 +267,10 @@ int setup_irq(unsigned int irq, struct i
* SA_TRIGGER_* but the PIC does not support
* multiple flow-types?
*/
- printk(KERN_WARNING "setup_irq(%d) SA_TRIGGER"
- "set. No set_type function available\n",
- irq);
+ printk(KERN_WARNING "No SA_TRIGGER set_type "
+ "function for IRQ %d (%s)\n", irq,
+ desc->chip ? desc->chip->name :
+ "unknown");
} else
compat_irq_chip_set_default_handler(desc);
@@ -299,7 +300,7 @@ int setup_irq(unsigned int irq, struct i
mismatch:
spin_unlock_irqrestore(&desc->lock, flags);
if (!(new->flags & SA_PROBEIRQ)) {
- printk(KERN_ERR "%s: irq handler mismatch\n", __FUNCTION__);
+ printk(KERN_ERR "IRQ handler type mismatch for IRQ %d\n", irq);
dump_stack();
}
return -EBUSY;
@@ -366,7 +367,7 @@ void free_irq(unsigned int irq, void *de
kfree(action);
return;
}
- printk(KERN_ERR "Trying to free free IRQ%d\n", irq);
+ printk(KERN_ERR "Trying to free already-free IRQ %d\n", irq);
spin_unlock_irqrestore(&desc->lock, flags);
return;
}
_
Patches currently in -mm which might be from bjorn.helgaas@xxxxxx are
origin.patch
pnpacpi-reject-acpi_producer-resources.patch
pnpacpi-support-shareable-interrupts.patch
serial-allow-shared-8250_pnp-interrupts.patch
2.6-sony_acpi4.patch
git-klibc.patch
e100-disable-interrupts-at-boot.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
