diff options
| author | Thomas Gleixner | 2015-01-15 22:22:21 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2015-01-22 15:10:55 +0100 |
| commit | 62e61633daeb0b53f0506aa6e170e2e4cc75cd65 (patch) | |
| tree | f8255210d1a76e10601e805af18a9a3fd4555b12 | |
| parent | x86/x2apic: Move code in conditional region (diff) | |
| download | kernel-qcow2-linux-62e61633daeb0b53f0506aa6e170e2e4cc75cd65.tar.gz kernel-qcow2-linux-62e61633daeb0b53f0506aa6e170e2e4cc75cd65.tar.xz kernel-qcow2-linux-62e61633daeb0b53f0506aa6e170e2e4cc75cd65.zip | |
x86/x2apic: Clarify remapping mode for x2apic enablement
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>
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index bda56eea929c..06b75216d171 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/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; } @@ -1611,7 +1611,7 @@ static int __init validate_x2apic(void) } 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 */ static int __init try_to_enable_IR(void) |