xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu: rename intr_remapping references to irq_remapping

Browse Source 
Make the code consistent with the naming conventions of irq subsystem.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Joerg Roedel <joerg.roedel@amd.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
Suresh Siddha
2012-03-30 11:47:07 -07:00
committed by Joerg Roedel
parent 263b5e8629
commit 95a02e976c
9 changed files with 148 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
arch/x86/kernel/apic/apic.c
View File

@@ -1442,8 +1442,8 @@ 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 (intr_remapping_enabled)
intr_enable_fault_handling();
if (irq_remapping_enabled)
irq_remap_enable_fault_handling();
}
@@ -1518,7 +1518,7 @@ void enable_x2apic(void)
int __init enable_IR(void)
{
#ifdef CONFIG_IRQ_REMAP
if (!intr_remapping_supported()) {
if (!irq_remapping_supported()) {
pr_debug("intr-remapping not supported\n");
return -1;
}
@@ -1529,7 +1529,7 @@ int __init enable_IR(void)
return -1;
}
return intr_hardware_enable();
return irq_remapping_enable();
#endif
return -1;
}
@@ -1541,9 +1541,9 @@ void __init enable_IR_x2apic(void)
int hardware_init_ret;
/* Make sure irq_remap_ops are initialized */
setup_intr_remapping();
setup_irq_remapping_ops();
hardware_init_ret = intr_hardware_init();
hardware_init_ret = irq_remapping_prepare();
if (hardware_init_ret && !x2apic_supported())
return;
@@ -2180,8 +2180,8 @@ static int lapic_suspend(void)
local_irq_save(flags);
disable_local_APIC();
if (intr_remapping_enabled)
intr_hardware_disable();
if (irq_remapping_enabled)
irq_remapping_disable();
local_irq_restore(flags);
return 0;
@@ -2197,7 +2197,7 @@ static void lapic_resume(void)
return;
local_irq_save(flags);
if (intr_remapping_enabled) {
if (irq_remapping_enabled) {
/*
* IO-APIC and PIC have their own resume routines.
* We just mask them here to make sure the interrupt
@@ -2249,8 +2249,8 @@ static void lapic_resume(void)
apic_write(APIC_ESR, 0);
apic_read(APIC_ESR);
if (intr_remapping_enabled)
intr_hardware_reenable(x2apic_mode);
if (irq_remapping_enabled)
irq_remapping_reenable(x2apic_mode);
local_irq_restore(flags);
}