leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/x2apic: Clarify remapping mode for x2apic enablement

Browse Source 
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 <tglx@linutronix.de>
Acked-by: Borislav Petkov <bp@alien8.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Tony Luck <tony.luck@intel.com>
Link: http://lkml.kernel.org/r/20150115211702.876012628@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2015-01-15 21:22:21 +00:00
parent 55eae7de72
commit 62e61633da
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()) if (!x2apic_supported())
return; 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 /* IR is required if there is APIC ID > 255 even when running
* under KVM * under KVM
*/ */
if (max_physical_apicid > 255 || if (max_physical_apicid > 255 ||
(IS_ENABLED(CONFIG_HYPERVISOR_GUEST) && (IS_ENABLED(CONFIG_HYPERVISOR_GUEST) &&
!hypervisor_x2apic_available())) { !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(); disable_x2apic();
return; return;
} }
@@ -1611,7 +1611,7 @@ static int __init validate_x2apic(void)
} }
early_initcall(validate_x2apic); early_initcall(validate_x2apic);
static inline void try_to_enable_x2apic(int ir_stat) { } static inline void try_to_enable_x2apic(int remap_mode) { }
#endif /* !CONFIG_X86_X2APIC */ #endif /* !CONFIG_X86_X2APIC */
static int __init try_to_enable_IR(void) static int __init try_to_enable_IR(void)