lkml.org 
[lkml]   [2011]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] mtrr: fix UP breakage caused during switch to stop_machine
    While removing custom rendezvous code and switching to stop_machine,
    commit 192d8857427d "x86, mtrr: use stop_machine APIs for doing MTRR
    rendezvous" completely dropped mtrr setting code on !CONFIG_SMP
    breaking MTRR settting on UP. Fix it by removing the incorrect
    CONFIG_SMP.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reported-by: Anders Eriksson <aeriksson@fastmail.fm>
    Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    ---
    arch/x86/kernel/cpu/mtrr/main.c | 2 --
    1 file changed, 2 deletions(-)

    diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
    index 08119a3..6b96110 100644
    --- a/arch/x86/kernel/cpu/mtrr/main.c
    +++ b/arch/x86/kernel/cpu/mtrr/main.c
    @@ -149,7 +149,6 @@ struct set_mtrr_data {
    */
    static int mtrr_rendezvous_handler(void *info)
    {
    -#ifdef CONFIG_SMP
    struct set_mtrr_data *data = info;

    /*
    @@ -171,7 +170,6 @@ static int mtrr_rendezvous_handler(void *info)
    } else if (mtrr_aps_delayed_init || !cpu_online(smp_processor_id())) {
    mtrr_if->set_all();
    }
    -#endif
    return 0;
    }


    \
     
     \ /
      Last update: 2011-08-25 19:49    [W:0.023 / U:91.388 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site