Pull a fix for the recent irqdomain bug fixes from Grant Likely: "I flubbed one patch in the last pull request which broke a format string on 64 bit platforms. Here's the fix." * tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6: irq_domain: fix type mismatch in debugfs output format
Showing the changes to kernel (1 of 1 file). Show all
Unified · Split
| @@ -629,7 +629,8 @@ static int virq_debug_show(struct seq_file *m, void *private) · 628 unmodified lines | |||
| 629 | int i; | 629 | int i; |
| 630 | 630 | ||
| 631 | seq_printf(m, "%-5s %-7s %-15s %-*s %s\n", "irq", "hwirq", | 631 | seq_printf(m, "%-5s %-7s %-15s %-*s %s\n", "irq", "hwirq", |
| 632 | "chip name", 2 * sizeof(void *) + 2, "chip data", "domain name"); | 632 | "chip name", (int)(2 * sizeof(void *) + 2), "chip data", |
| 633 | "domain name"); | ||
| 633 | 634 | ||
| 634 | for (i = 1; i < nr_irqs; i++) { | 635 | for (i = 1; i < nr_irqs; i++) { |
| 635 | desc = irq_to_desc(i); | 636 | desc = irq_to_desc(i); |