git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl-removal' into next
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
msi_ia64.c
diff --git
a/arch/ia64/kernel/msi_ia64.c
b/arch/ia64/kernel/msi_ia64.c
index
e86d029
..
60c6ef6
100644
(file)
--- a/
arch/ia64/kernel/msi_ia64.c
+++ b/
arch/ia64/kernel/msi_ia64.c
@@
-57,7
+57,7
@@
static void ia64_set_msi_irq_affinity(unsigned int irq, cpumask_t cpu_mask)
if (!cpu_online(cpu))
return;
- if (
reassign_irq_vector
(irq, cpu))
+ if (
irq_prepare_move
(irq, cpu))
return;
read_msi_msg(irq, &msg);
@@
-119,6
+119,7
@@
void ia64_teardown_msi_irq(unsigned int irq)
static void ia64_ack_msi_irq(unsigned int irq)
{
+ irq_complete_move(irq);
move_native_irq(irq);
ia64_eoi();
}