projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
[powerpc.git]
/
kernel
/
irq
/
chip.c
diff --git
a/kernel/irq/chip.c
b/kernel/irq/chip.c
index
0133f4f
..
615ce97
100644
(file)
--- a/
kernel/irq/chip.c
+++ b/
kernel/irq/chip.c
@@
-11,6
+11,7
@@
*/
#include <linux/irq.h>
*/
#include <linux/irq.h>
+#include <linux/msi.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
@@
-185,6
+186,8
@@
int set_irq_msi(unsigned int irq, struct msi_desc *entry)
desc = irq_desc + irq;
spin_lock_irqsave(&desc->lock, flags);
desc->msi_desc = entry;
desc = irq_desc + irq;
spin_lock_irqsave(&desc->lock, flags);
desc->msi_desc = entry;
+ if (entry)
+ entry->irq = irq;
spin_unlock_irqrestore(&desc->lock, flags);
return 0;
}
spin_unlock_irqrestore(&desc->lock, flags);
return 0;
}