From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751990AbaLQEdc (ORCPT ); Tue, 16 Dec 2014 23:33:32 -0500 Received: from mga11.intel.com ([192.55.52.93]:55927 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711AbaLQEd2 (ORCPT ); Tue, 16 Dec 2014 23:33:28 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="429971357" From: Jiang Liu To: Thomas Gleixner , Joerg Roedel , Benjamin Herrenschmidt , Ingo Molnar , "H. Peter Anvin" , Yinghai Lu , Borislav Petkov , x86@kernel.org, Jiang Liu , David Rientjes , HATAYAMA Daisuke , Richard Weinberger , Oren Twaig Cc: Tony Luck , linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, "H. Peter Anvin" , Ingo Molnar Subject: [Patch v1 07/17] x86/apic: Correctly detect X2APIC status in function enable_IR() Date: Wed, 17 Dec 2014 12:35:38 +0800 Message-Id: <1418790948-22804-8-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1418790948-22804-1-git-send-email-jiang.liu@linux.intel.com> References: <1418790948-22804-1-git-send-email-jiang.liu@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 4a65e1aced33..ab7c7f9eb85f 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1580,7 +1580,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; -- 1.7.10.4