lkml.org 
[lkml]   [2012]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/3] um: Avoid raw handling of cpu_online_map
    Date
    Use init_cpu_online and set_cpu_online instead.

    Signed-off-by: Venkatesh Pallipadi <venki@google.com>
    ---
    arch/um/kernel/skas/process.c | 2 +-
    arch/um/kernel/smp.c | 8 ++++----
    2 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
    index 2e9852c..5daa0f5 100644
    --- a/arch/um/kernel/skas/process.c
    +++ b/arch/um/kernel/skas/process.c
    @@ -41,7 +41,7 @@ static int __init start_kernel_proc(void *unused)
    cpu_tasks[0].pid = pid;
    cpu_tasks[0].task = current;
    #ifdef CONFIG_SMP
    - cpu_online_map = cpumask_of_cpu(0);
    + init_cpu_online(cpumask_of(0));
    #endif
    start_kernel();
    return 0;
    diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
    index 155206a..b5d2ca9 100644
    --- a/arch/um/kernel/smp.c
    +++ b/arch/um/kernel/smp.c
    @@ -76,7 +76,7 @@ static int idle_proc(void *cpup)
    cpu_relax();

    notify_cpu_starting(cpu);
    - cpu_set(cpu, cpu_online_map);
    + set_cpu_online(cpu, true);
    default_idle();
    return 0;
    }
    @@ -110,8 +110,8 @@ void smp_prepare_cpus(unsigned int maxcpus)
    for (i = 0; i < ncpus; ++i)
    set_cpu_possible(i, true);

    - cpu_clear(me, cpu_online_map);
    - cpu_set(me, cpu_online_map);
    + set_cpu_online(me, false);
    + set_cpu_online(me, true);
    cpu_set(me, cpu_callin_map);

    err = os_pipe(cpu_data[me].ipi_pipe, 1, 1);
    @@ -138,7 +138,7 @@ void smp_prepare_cpus(unsigned int maxcpus)

    void smp_prepare_boot_cpu(void)
    {
    - cpu_set(smp_processor_id(), cpu_online_map);
    + set_cpu_online(smp_processor_id(), true);
    }

    int __cpu_up(unsigned int cpu)
    --
    1.7.7.3


    \
     
     \ /
      Last update: 2012-02-14 23:55    [W:0.022 / U:28.912 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site