iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: x2apic, IR: Clean up panic() with nox2apic boot option

Browse Source 
Instead of panic() ignore the "nox2apic" boot option when BIOS
has already enabled x2apic prior to OS handover.

[ Impact: printk warning instead of panic() when BIOS has enabled x2apic already ]

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: dwmw2@infradead.org
Cc: Weidong Han <weidong.han@intel.com>
LKML-Reference: <20090420200450.425091000@linux-os.sc.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Suresh Siddha 2009-04-20 13:02:29 -07:00 committed by Ingo Molnar
parent 25629d810a
commit 39d83a5d68
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/apic/apic.c
View File

@ -141,8 +141,12 @@ static int x2apic_preenabled;
static int disable_x2apic; static int disable_x2apic;
static __init int setup_nox2apic(char *str) static __init int setup_nox2apic(char *str)
{ {
if (x2apic_enabled()) if (x2apic_enabled()) {
panic("Bios already enabled x2apic, can't enforce nox2apic"); pr_warning("Bios already enabled x2apic, "
"can't enforce nox2apic");
return 0;
}
disable_x2apic = 1; disable_x2apic = 1;
setup_clear_cpu_cap(X86_FEATURE_X2APIC); setup_clear_cpu_cap(X86_FEATURE_X2APIC);
return 0; return 0;