lkml.org 
[lkml]   [2009]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 3/5] x2apic, IR: cleanup panic() with nox2apic boot option
    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;
    --



    \
     
     \ /
      Last update: 2009-04-20 22:17    [W:2.874 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site