Commit-ID: 89356cf20ecb0b9975b1dad9ed605dd4c6e68bcd Gitweb: http://git.kernel.org/tip/89356cf20ecb0b9975b1dad9ed605dd4c6e68bcd Author: Jiang Liu <jiang....@linux.intel.com> AuthorDate: Wed, 7 Jan 2015 15:31:33 +0800 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Thu, 15 Jan 2015 11:24:23 +0100
x86/apic: Correctly detect X2APIC status in function enable_IR() X2APIC will be disabled if user specifies "nox2apic" on kernel command line, even when x2apic_preenabled is true. So correctly detect X2APIC status by using x2apic_enabled() instead of x2apic_preenabled. Signed-off-by: Jiang Liu <jiang....@linux.intel.com> Cc: Tony Luck <tony.l...@intel.com> Cc: io...@lists.linux-foundation.org Cc: H. Peter Anvin <h...@linux.intel.com> Cc: Joerg Roedel <j...@8bytes.org> Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> Cc: Yinghai Lu <ying...@kernel.org> Cc: Borislav Petkov <b...@alien8.de> Cc: David Rientjes <rient...@google.com> Cc: HATAYAMA Daisuke <d.hatay...@jp.fujitsu.com> Cc: Jan Beulich <jbeul...@suse.com> Cc: Richard Weinberger <rich...@nod.at> Cc: Oren Twaig <o...@scalemp.com> Link: http://lkml.kernel.org/r/1420615903-28253-7-git-send-email-jiang....@linux.intel.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- arch/x86/kernel/apic/apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 2dbd3a0..11358df 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1581,7 +1581,7 @@ int __init enable_IR(void) return -1; } - if (!x2apic_preenabled && skip_ioapic_setup) { + if (!x2apic_enabled() && skip_ioapic_setup) { pr_info("Skipped enabling intr-remap because of skipping " "io-apic setup\n"); return -1; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
