Commit b3dfd76c authored Apr 12, 2012 by Linus Torvalds

linux-2.6

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

parents 9b1ef1de 5269a9ab

kernel/irq/irqdomain.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -629,7 +629,8 @@ static int virq_debug_show(struct seq_file m, void private)
		int i;

		seq_printf(m, "%-5s %-7s %-15s %-*s %s\n", "irq", "hwirq",
		"chip name", 2 * sizeof(void *) + 2, "chip data", "domain name");
		"chip name", (int)(2 * sizeof(void *) + 2), "chip data",
		"domain name");

		for (i = 1; i < nr_irqs; i++) {
		desc = irq_to_desc(i);