Rename the argument of try_to_enable_x2apic() so the purpose becomes more clear.
Make the pr_warning more consistent and avoid the double print of "disabling". Signed-off-by: Thomas Gleixner <[email protected]> --- arch/x86/kernel/apic/apic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: tip/arch/x86/kernel/apic/apic.c =================================================================== --- tip.orig/arch/x86/kernel/apic/apic.c +++ tip/arch/x86/kernel/apic/apic.c @@ -1561,19 +1561,19 @@ void enable_x2apic(void) } } -static __init void try_to_enable_x2apic(int ir_stat) +static __init void try_to_enable_x2apic(int remap_mode) { if (!x2apic_supported()) return; - if (ir_stat != IRQ_REMAP_X2APIC_MODE) { + if (remap_mode != IRQ_REMAP_X2APIC_MODE) { /* IR is required if there is APIC ID > 255 even when running * under KVM */ if (max_physical_apicid > 255 || (IS_ENABLED(CONFIG_HYPERVISOR_GUEST) && !hypervisor_x2apic_available())) { - pr_info("IRQ remapping doesn't support X2APIC mode, disable x2apic.\n"); + pr_info("x2apic: IRQ remapping doesn't support X2APIC mode\n"); disable_x2apic(); return; } @@ -1609,7 +1609,7 @@ void __init check_x2apic(void) */ panic("BIOS has enabled x2apic but kernel doesn't support x2apic, please disable x2apic in BIOS.\n"); } -static inline void try_to_enable_x2apic(int ir_stat) { } +static inline void try_to_enable_x2apic(int remap_mode) { } #endif /* !CONFIG_X86_X2APIC */ static int __init try_to_enable_IR(void) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
