[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <1418194071-13785-3-git-send-email-jiang.liu@linux.intel.com>
Date: Wed, 10 Dec 2014 14:47:44 +0800
From: Jiang Liu <jiang.liu@...ux.intel.com>
To: "H. Peter Anvin" <hpa@...or.com>,
Thomas Gleixner <tglx@...utronix.de>,
Joerg Roedel <joro@...tes.org>,
David Woodhouse <dwmw2@...radead.org>,
Borislav Petkov <bp@...en8.de>, Ingo Molnar <mingo@...hat.com>,
x86@...nel.org, Jiang Liu <jiang.liu@...ux.intel.com>,
David Rientjes <rientjes@...gle.com>,
HATAYAMA Daisuke <d.hatayama@...fujitsu.com>,
Jan Beulich <JBeulich@...e.com>,
Richard Weinberger <richard@....at>,
Oren Twaig <oren@...lemp.com>
Cc: Tony Luck <tony.luck@...el.com>, iommu@...ts.linux-foundation.org,
linux-kernel@...r.kernel.org,
"H. Peter Anvin" <hpa@...ux.intel.com>,
Ingo Molnar <mingo@...nel.org>
Subject: [RFC Patch V1 2/9] 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.liu@...ux.intel.com>
---
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 e7a426a589df..b6c473b97c5c 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists