lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2012-04-12 15:33:16 -07:00
parent 9b1ef1de20 5269a9ab7d
commit b3dfd76c94
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/irq/irqdomain.c
View File

@@ -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);