diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 01:39:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-05 01:39:23 +0100 |
| commit | 71ca44dac4cbf89ce88e460a293cc25c5b18fa50 (patch) | |
| tree | 199c54ee6ecfbdda0bf035df0257bbd278b97531 /arch/ia64/kernel/msi_ia64.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff) | |
| parent | [IA64] fix ia64 kprobes compilation (diff) | |
| download | linux-71ca44dac4cbf89ce88e460a293cc25c5b18fa50.tar.xz linux-71ca44dac4cbf89ce88e460a293cc25c5b18fa50.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] fix ia64 kprobes compilation
[IA64] move gcc_intrin.h from header-y to unifdef-y
[IA64] workaround tiger ia64_sal_get_physical_id_info hang
[IA64] move defconfig to arch/ia64/configs/
[IA64] Fix irq migration in multiple vector domain
[IA64] signal(ia64_ia32): add a signal stack overflow check
[IA64] signal(ia64): add a signal stack overflow check
[IA64] CONFIG_SGI_SN2 - auto select NUMA and ACPI_NUMA
Diffstat (limited to 'arch/ia64/kernel/msi_ia64.c')
| -rw-r--r-- | arch/ia64/kernel/msi_ia64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c index e86d02959794..60c6ef67ebb2 100644 --- 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(); } |