lkml.org 
[lkml]   [2008]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 25/31] cpumask: clean rcu files
    Signed-of-by: Mike Travis <travis@sgi.com>
    ---
    include/linux/rcuclassic.h | 2 +-
    kernel/rcuclassic.c | 2 +-
    kernel/rcupreempt.c | 2 +-
    kernel/rcutorture.c | 12 ++++++------
    4 files changed, 9 insertions(+), 9 deletions(-)

    --- struct-cpumasks.orig/include/linux/rcuclassic.h
    +++ struct-cpumasks/include/linux/rcuclassic.h
    @@ -53,7 +53,7 @@ struct rcu_ctrlblk {
    int signaled;

    spinlock_t lock ____cacheline_internodealigned_in_smp;
    - cpumask_t cpumask; /* CPUs that need to switch in order */
    + cpumask_map_t cpumask; /* CPUs that need to switch in order */
    /* for current batch to proceed. */
    } ____cacheline_internodealigned_in_smp;

    --- struct-cpumasks.orig/kernel/rcuclassic.c
    +++ struct-cpumasks/kernel/rcuclassic.c
    @@ -85,7 +85,7 @@ static void force_quiescent_state(struct
    struct rcu_ctrlblk *rcp)
    {
    int cpu;
    - cpumask_t cpumask;
    + cpumask_var_t cpumask;
    unsigned long flags;

    set_need_resched();
    --- struct-cpumasks.orig/kernel/rcupreempt.c
    +++ struct-cpumasks/kernel/rcupreempt.c
    @@ -164,7 +164,7 @@ static char *rcu_try_flip_state_names[]
    { "idle", "waitack", "waitzero", "waitmb" };
    #endif /* #ifdef CONFIG_RCU_TRACE */

    -static cpumask_t rcu_cpu_online_map __read_mostly = CPU_MASK_NONE;
    +static cpumask_map_t rcu_cpu_online_map __read_mostly = CPU_MASK_NONE;

    /*
    * Enum and per-CPU flag to determine when each CPU has seen
    --- struct-cpumasks.orig/kernel/rcutorture.c
    +++ struct-cpumasks/kernel/rcutorture.c
    @@ -843,7 +843,7 @@ static int rcu_idle_cpu; /* Force all to
    */
    static void rcu_torture_shuffle_tasks(void)
    {
    - cpumask_t tmp_mask;
    + cpumask_var_t tmp_mask;
    int i;

    cpus_setall(tmp_mask);
    @@ -858,27 +858,27 @@ static void rcu_torture_shuffle_tasks(vo
    if (rcu_idle_cpu != -1)
    cpu_clear(rcu_idle_cpu, tmp_mask);

    - set_cpus_allowed(current, &tmp_mask);
    + set_cpus_allowed(current, tmp_mask);

    if (reader_tasks) {
    for (i = 0; i < nrealreaders; i++)
    if (reader_tasks[i])
    set_cpus_allowed(reader_tasks[i],
    - &tmp_mask);
    + tmp_mask);
    }

    if (fakewriter_tasks) {
    for (i = 0; i < nfakewriters; i++)
    if (fakewriter_tasks[i])
    set_cpus_allowed(fakewriter_tasks[i],
    - &tmp_mask);
    + tmp_mask);
    }

    if (writer_task)
    - set_cpus_allowed(writer_task, &tmp_mask);
    + set_cpus_allowed(writer_task, tmp_mask);

    if (stats_task)
    - set_cpus_allowed(stats_task, &tmp_mask);
    + set_cpus_allowed(stats_task, tmp_mask);

    if (rcu_idle_cpu == -1)
    rcu_idle_cpu = num_online_cpus() - 1;
    --


    \
     
     \ /
      Last update: 2008-09-29 20:17    [W:0.025 / U:0.176 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site