diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-02 23:38:43 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-02 23:38:43 +0300 |
| commit | 2451d1e59d5a154a42bcf02e0bfeebb01d8df1e0 (patch) | |
| tree | 3f540d996f91441d189323a6452a39dc1db7c8ac /drivers/iommu | |
| parent | 67dbfc142310698b979d12a689aa9e0b4a93dced (diff) | |
| parent | e25283bf83bd97a61007ab383695f4872e2eb43f (diff) | |
| download | linux-2451d1e59d5a154a42bcf02e0bfeebb01d8df1e0.tar.xz | |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 apic updates from Ingo Molnar:
"The main x86 APIC/IOAPIC changes in this cycle were:
- Robustify kexec support to more carefully restore IRQ hardware
state before calling into kexec/kdump kernels. (Baoquan He)
- Clean up the local APIC code a bit (Dou Liyang)
- Remove unused callbacks (David Rientjes)"
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/apic: Finish removing unused callbacks
x86/apic: Drop logical_smp_processor_id() inline
x86/apic: Modernize the pending interrupt code
x86/apic: Move pending interrupt check code into it's own function
x86/apic: Set up through-local-APIC mode on the boot CPU if 'noapic' specified
x86/apic: Rename variables and functions related to x86_io_apic_ops
x86/apic: Remove the (now) unused disable_IO_APIC() function
x86/apic: Fix restoring boot IRQ mode in reboot and kexec/kdump
x86/apic: Split disable_IO_APIC() into two functions to fix CONFIG_KEXEC_JUMP=y
x86/apic: Split out restore_boot_irq_mode() from disable_IO_APIC()
x86/apic: Make setup_local_APIC() static
x86/apic: Simplify init_bsp_APIC() usage
x86/x2apic: Mark set_x2apic_phys_mode() as __init
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/irq_remapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c index 49721b4e1975..496deee3ae3a 100644 --- a/drivers/iommu/irq_remapping.c +++ b/drivers/iommu/irq_remapping.c @@ -27,7 +27,7 @@ int disable_irq_post = 0; static int disable_irq_remap; static struct irq_remap_ops *remap_ops; -static void irq_remapping_disable_io_apic(void) +static void irq_remapping_restore_boot_irq_mode(void) { /* * With interrupt-remapping, for now we will use virtual wire A @@ -42,7 +42,7 @@ static void irq_remapping_disable_io_apic(void) static void __init irq_remapping_modify_x86_ops(void) { - x86_io_apic_ops.disable = irq_remapping_disable_io_apic; + x86_apic_ops.restore = irq_remapping_restore_boot_irq_mode; } static __init int setup_nointremap(char *str) |