x86, apic: Move irq_remapping_enabled checks into IRQ-remapping code
Move the three easy to move checks in the x86' apic.c file into the IRQ-remapping code. Signed-off-by: Joerg Roedel <joro@8bytes.org> Acked-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
@@ -1477,8 +1477,7 @@ void __init bsp_end_local_APIC_setup(void)
|
||||
* Now that local APIC setup is completed for BP, configure the fault
|
||||
* handling for interrupt remapping.
|
||||
*/
|
||||
if (irq_remapping_enabled)
|
||||
irq_remap_enable_fault_handling();
|
||||
irq_remap_enable_fault_handling();
|
||||
|
||||
}
|
||||
|
||||
@@ -2251,8 +2250,7 @@ static int lapic_suspend(void)
|
||||
local_irq_save(flags);
|
||||
disable_local_APIC();
|
||||
|
||||
if (irq_remapping_enabled)
|
||||
irq_remapping_disable();
|
||||
irq_remapping_disable();
|
||||
|
||||
local_irq_restore(flags);
|
||||
return 0;
|
||||
@@ -2320,8 +2318,7 @@ static void lapic_resume(void)
|
||||
apic_write(APIC_ESR, 0);
|
||||
apic_read(APIC_ESR);
|
||||
|
||||
if (irq_remapping_enabled)
|
||||
irq_remapping_reenable(x2apic_mode);
|
||||
irq_remapping_reenable(x2apic_mode);
|
||||
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
|
Reference in New Issue
Block a user