From 9009c1dcdbab881d35ca869cd3e568fd8f9f3c89 Mon Sep 17 00:00:00 2001 From: Suresh Siddha Date: Mon, 20 Apr 2009 13:02:29 -0700 Subject: [PATCH] --- yaml --- r: 145616 b: refs/heads/master c: 39d83a5d684a457046aa2a6dac60f105966e78e9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic/apic.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8d1e399d3a65..1bc785de5ec4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25629d810a52176758401184d9b437fbb7f79195 +refs/heads/master: 39d83a5d684a457046aa2a6dac60f105966e78e9 diff --git a/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c index 2b30e520dce3..d32f5589f1dd 100644 --- a/trunk/arch/x86/kernel/apic/apic.c +++ b/trunk/arch/x86/kernel/apic/apic.c @@ -141,8 +141,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;