Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6

b3dfd76c · Linus Torvalds <[email protected]> · 2012-04-12 15:33:16 -07:00

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

Commit: b3dfd76c945b879513b991bac23ffcb97fe88ec2
Parents: 9b1ef1de · 5269a9ab

Merge commit. Changes below are compared with the first parent: 9b1ef1de.

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
kernel/irq/irqdomain.c	modified	+2	−1	View file

kernel/irq/irqdomain.c

View file

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index d34413e..0e0ba5f 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -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);