lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[031/116] sched: Mark boot-cpu active before smp_init()
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Peter Zijlstra <a.p.zijlstra@chello.nl>

    commit 933b0618d8b2a59c7a0742e43836544e02f1e9bd upstream.

    A UP machine has 1 active cpu, not having the boot-cpu in the
    active map when starting the scheduler confuses things.

    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Mike Galbraith <efault@gmx.de>
    LKML-Reference: <20091216170517.423469527@chello.nl>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Cc: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    init/main.c | 7 +------
    1 file changed, 1 insertion(+), 6 deletions(-)

    --- a/init/main.c
    +++ b/init/main.c
    @@ -369,12 +369,6 @@ static void __init smp_init(void)
    {
    unsigned int cpu;

    - /*
    - * Set up the current CPU as possible to migrate to.
    - * The other ones will be done by cpu_up/cpu_down()
    - */
    - set_cpu_active(smp_processor_id(), true);
    -
    /* FIXME: This should be done in userspace --RR */
    for_each_present_cpu(cpu) {
    if (num_online_cpus() >= setup_max_cpus)
    @@ -486,6 +480,7 @@ static void __init boot_cpu_init(void)
    int cpu = smp_processor_id();
    /* Mark the boot cpu "present", "online" etc for SMP and UP case */
    set_cpu_online(cpu, true);
    + set_cpu_active(cpu, true);
    set_cpu_present(cpu, true);
    set_cpu_possible(cpu, true);
    }



    \
     
     \ /
      Last update: 2010-03-31 02:17    [W:0.022 / U:118.896 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site