From: Suresh Siddha <suresh.b.siddha@intel.com>
To: mingo@elte.hu, hpa@zytor.com, tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, dwmw2@infradead.org,
Suresh Siddha <suresh.b.siddha@intel.com>,
Weidong Han <weidong.han@intel.com>
Subject: [patch 3/5] x2apic, IR: cleanup panic() with nox2apic boot option
Date: Mon, 20 Apr 2009 13:02:29 -0700 [thread overview]
Message-ID: <20090420200450.425091000@linux-os.sc.intel.com> (raw)
In-Reply-To: 20090420200450.128993000@linux-os.sc.intel.com
[-- Attachment #1: fix_panic_msg.patch --]
[-- Type: text/plain, Size: 823 bytes --]
Instead of panic() ignore the "nox2apic" boot option when BIOS has
already enabled x2apic prior to OS handover.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Weidong Han <weidong.han@intel.com>
---
Index: tip/arch/x86/kernel/apic/apic.c
===================================================================
--- tip.orig/arch/x86/kernel/apic/apic.c
+++ tip/arch/x86/kernel/apic/apic.c
@@ -142,8 +142,12 @@ static int x2apic_preenabled;
static int disable_x2apic;
static __init int setup_nox2apic(char *str)
{
- if (x2apic_enabled())
- panic("Bios already enabled x2apic, can't enforce nox2apic");
+ if (x2apic_enabled()) {
+ pr_warning("Bios already enabled x2apic, "
+ "can't enforce nox2apic");
+ return 0;
+ }
+
disable_x2apic = 1;
setup_clear_cpu_cap(X86_FEATURE_X2APIC);
return 0;
--
next prev parent reply other threads:[~2009-04-20 20:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-20 20:02 [patch 1/5] x2apic, IR: cleanup X86_X2APIC and INTR_REMAP config checks Suresh Siddha
2009-04-20 20:02 ` [patch 2/5] x2apic, IR: Fix compiler warning with !CONFIG_INTR_REMAP Suresh Siddha
2009-04-21 8:07 ` [tip:x86/apic] x86: x2apic, IR: Move eoi_ioapic_irq() into a CONFIG_INTR_REMAP section tip-bot for Suresh Siddha
2009-04-21 14:04 ` Cyrill Gorcunov
2009-04-20 20:02 ` Suresh Siddha [this message]
2009-04-21 7:01 ` [patch 3/5] x2apic, IR: cleanup panic() with nox2apic boot option Ingo Molnar
2009-04-21 8:07 ` [tip:x86/apic] x86: x2apic, IR: Clean up " tip-bot for Suresh Siddha
2009-04-20 20:02 ` [patch 4/5] x2apic, IR: remove reinit_intr_remapped_IO_APIC() Suresh Siddha
2009-04-21 6:37 ` Han, Weidong
2009-04-21 7:01 ` Ingo Molnar
2009-04-21 18:24 ` Suresh Siddha
2009-04-22 2:55 ` Han, Weidong
2009-04-22 10:03 ` Ingo Molnar
2009-04-22 10:06 ` [tip:x86/apic] x86: " tip-bot for Suresh Siddha
2009-04-20 20:02 ` [patch 5/5] x2apic, IR: Make config X86_UV dependent on X86_X2APIC Suresh Siddha
2009-04-20 20:33 ` Jack Steiner
2009-04-21 8:07 ` [tip:x86/apic] x86: " tip-bot for Suresh Siddha
2009-04-21 6:58 ` [patch 1/5] x2apic, IR: cleanup X86_X2APIC and INTR_REMAP config checks Ingo Molnar
2009-04-21 8:06 ` [tip:x86/apic] x86: x2apic, IR: Clean up " tip-bot for Suresh Siddha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090420200450.425091000@linux-os.sc.intel.com \
--to=suresh.b.siddha@intel.com \
--cc=dwmw2@infradead.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=weidong.han@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.