diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 15:33:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 15:33:16 -0700 |
| commit | b3dfd76c945b879513b991bac23ffcb97fe88ec2 (patch) | |
| tree | fa5044e39dc816293ebf46cbb208443039eec7c5 /kernel | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | irq_domain: fix type mismatch in debugfs output format (diff) | |
| download | linux-dev-b3dfd76c945b879513b991bac23ffcb97fe88ec2.tar.xz linux-dev-b3dfd76c945b879513b991bac23ffcb97fe88ec2.zip | |
Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/irqdomain.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index d34413e78628..0e0ba5f840b2 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); |